Commit c4a50ff6 authored by Kristin Berry's avatar Kristin Berry
Browse files

Merge pull request #34 from jlaura/subpixel 

GDAL build problem for travis fixed.
parents 8e862b85 fd7be403

.travis.yml

+1 −1
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