Commit 55ba4cbe authored by Adam Paquette's avatar Adam Paquette
Browse files

Merge remote-tracking branch 'upstream/master'

parents f65e7283 83647382

.travis.yml

+2 −3
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ install: 


  # Install the non-conda packages if required, requirements.txt duplicates are ignored

  - conda install -c https://conda.anaconda.org/jlaura opencv3=3.0.0

  - conda install -c https://conda.anaconda.org/jlaura h5py gdal

  - conda install -c osgeo proj4

  - conda upgrade numpy

  - conda config --add channels conda-forge

  - conda install -c https://conda.anaconda.org/conda-forge gdal h5py

  - pip install -r requirements.txt

  - pip install coverage

  - pip install coveralls