adopt conda-forge

Author: marqh

.travis.yml

@@ -49,12 +49,12 @@ install:
 
   # Customise the testing environment
   # ---------------------------------
-  - conda config --add channels scitools
+  - conda config --add channels conda-forge
   - if [[ "$TEST_MINIMAL" == true ]]; then
       conda install --quiet --file minimal-conda-requirements.txt;
     else
       if [[ "$TRAVIS_PYTHON_VERSION" == 3* ]]; then
-        sed -e '/ecmwf_grib/d' -e '/esmpy/d' -e '/iris_grib/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
+        sed -e '/ecmwf_grib/d' -e '/esmpy/d' -e '/iris-grib/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
       else
         conda install --quiet --file conda-requirements.txt;
       fi

conda-requirements.txt

@@ -4,9 +4,9 @@
 # Mandatory dependencies
 biggus
 cartopy
-matplotlib
-netcdf4
-numpy
+matplotlib<2
+netcdf4==1.2.4
+numpy<1.12
 pyke
 udunits2
 cf_units
@@ -19,14 +19,14 @@ mock
 nose
 pep8
 sphinx
-iris_sample_data
+iris-sample-data
 filelock
 imagehash
 requests
 
 # Optional iris dependencies
 nc_time_axis
-iris_grib
+iris-grib
 esmpy>=7.0
 gdal
 libmo_unpack

lib/iris/tests/results/analysis/weighted_mean_lat.cml

@@ -21,6 +21,6 @@
         <coord name="lat"/>
       </cellMethod>
     </cellMethods>
-    <data dtype="float64" shape="(3,)" state="loaded"/>
+    <data dtype="float32" shape="(3,)" state="loaded"/>
   </cube>
 </cubes>

lib/iris/tests/results/analysis/weighted_mean_latlon.cml

@@ -22,6 +22,6 @@
         <coord name="lon"/>
       </cellMethod>
     </cellMethods>
-    <data dtype="float64" shape="()" state="loaded"/>
+    <data dtype="float32" shape="()" state="loaded"/>
   </cube>
 </cubes>

lib/iris/tests/results/analysis/weighted_mean_lon.cml

@@ -21,6 +21,6 @@
         <coord name="lon"/>
       </cellMethod>
     </cellMethods>
-    <data dtype="float64" shape="(3,)" state="loaded"/>
+    <data dtype="float32" shape="(3,)" state="loaded"/>
   </cube>
 </cubes>

minimal-conda-requirements.txt

@@ -4,9 +4,9 @@
 # Mandatory dependencies
 biggus
 cartopy
-matplotlib
-netcdf4
-numpy
+matplotlib<2
+netcdf4==1.2.4
+numpy<1.12
 pyke
 udunits2
 cf_units