Commit 60ffb5ce authored by jay's avatar jay
Browse files

Merge remote-tracking branch 'upstream/master'

parents 6d5c9985 7c55c0aa

.travis.yml

+1 −1
Changes for .travis.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 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/osgeo gdal

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

  - conda install -c osgeo proj4

  - conda upgrade numpy

  - pip install -r requirements.txt

requirements.txt

+1 −1
Changes for requirements.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
numpy>=1.10.0

scipy>=0.17.0

gdal>=2.0

gdal>=1.11.2

pvl>=0.2.0

pysal>=1.11.0

protobuf==3.0.0b2