Merge pull request #17 from OGGM/appveyor

Repaired fiona on ioos
OGGM · Dec 17, 2015 · f3b8070 · f3b8070
2 parents 8e77a2f + 214291e
commit f3b8070
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,8 +26,7 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
   # install dependencies
-  - "conda install --yes --quiet -c https://conda.anaconda.org/ioos geopandas=0.1.1 pandas matplotlib Pillow joblib netCDF4 rasterio scikit-image configobj nose pyproj numpy=1.9.3 gdal=1.11.1"
-  - "conda install --force --yes --quiet fiona=1.5.1"
+  - "conda install --yes --quiet -c ioos geopandas matplotlib=1.4.3 Pillow joblib netCDF4 scikit-image configobj nose pyproj numpy"
   - "pip install git+https://github.com/fmaussion/motionless.git"
   - "pip install git+https://github.com/fmaussion/salem.git"
   - "pip install git+https://github.com/fmaussion/cleo.git"

diff --git a/oggm/tests/test_graphics.py b/oggm/tests/test_graphics.py
@@ -29,7 +29,7 @@
 
 # TODO: temporary: for conda installs
 import osgeo.gdal
-if osgeo.gdal.__version__ in ['1.11.2', '1.11.1']:
+if osgeo.gdal.__version__ >= '1.11':
     suffix += '_conda'
 
 
@@ -162,4 +162,4 @@ def test_inversion():
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", category=UserWarning,
                                 message=r'.*guessing baseline image.*')
-        nose.runmodule(argv=['-s', '-v', '--with-doctest'], exit=False)
+        nose.runmodule(argv=['-s', '-v', '--with-doctest'], exit=False)