From 8f7524dbdff2f4691c3e5c21540ec110cd29bf90 Mon Sep 17 00:00:00 2001
From: markh <markh@metarelate.net>
Date: Thu, 23 Feb 2017 13:24:36 +0000
Subject: [PATCH] adopt conda-forge

---
 .travis.yml                                            |  4 ++--
 conda-requirements.txt                                 | 10 +++++-----
 lib/iris/tests/results/analysis/weighted_mean_lat.cml  |  2 +-
 .../tests/results/analysis/weighted_mean_latlon.cml    |  2 +-
 lib/iris/tests/results/analysis/weighted_mean_lon.cml  |  2 +-
 lib/iris/tests/results/imagerepo.json                  |  5 +++--
 minimal-conda-requirements.txt                         |  6 +++---
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3458ab9dc8..a1b4e6dea5 100644
--- a/.travis.yml
+++ b/.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
diff --git a/conda-requirements.txt b/conda-requirements.txt
index 3324c5fbc4..101174cbf2 100644
--- a/conda-requirements.txt
+++ b/conda-requirements.txt
@@ -4,9 +4,9 @@
 # Mandatory dependencies
 biggus
 cartopy
-matplotlib
-netcdf4
-numpy
+matplotlib<2
+netcdf4==1.2.2
+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
diff --git a/lib/iris/tests/results/analysis/weighted_mean_lat.cml b/lib/iris/tests/results/analysis/weighted_mean_lat.cml
index 6c2076388e..fb8e032bc7 100644
--- a/lib/iris/tests/results/analysis/weighted_mean_lat.cml
+++ b/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>
diff --git a/lib/iris/tests/results/analysis/weighted_mean_latlon.cml b/lib/iris/tests/results/analysis/weighted_mean_latlon.cml
index bb2ea78521..738a622f00 100644
--- a/lib/iris/tests/results/analysis/weighted_mean_latlon.cml
+++ b/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>
diff --git a/lib/iris/tests/results/analysis/weighted_mean_lon.cml b/lib/iris/tests/results/analysis/weighted_mean_lon.cml
index a45ade8bb6..8006e50759 100644
--- a/lib/iris/tests/results/analysis/weighted_mean_lon.cml
+++ b/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>
diff --git a/lib/iris/tests/results/imagerepo.json b/lib/iris/tests/results/imagerepo.json
index 9b95de4325..15272623e9 100644
--- a/lib/iris/tests/results/imagerepo.json
+++ b/lib/iris/tests/results/imagerepo.json
@@ -728,11 +728,12 @@
     "iris.tests.test_quickplot.TestTimeReferenceUnitsLabels.test_not_reference_time_units.0": [
         "https://scitools.github.io/test-iris-imagehash/images/415f85e9fefb91e94600bb6f07009be7effa1966ab065b273b009b663b007a04.png", 
         "https://scitools.github.io/test-iris-imagehash/images/411d85e9fefb91e14600bb6707009be7effe1966ab06fb273b009b663f007a04.png", 
-        "https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6f07009be7effe1966ab067b273b009b663b007a04.png"
+        "https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6f07009be7effe1966ab067b273b009b663b007a04.png",
+	"https://scitools.github.io/test-iris-imagehash/images/411f85e9fefb91e14600bb6707009be7effe1966ab06fb273b00bb263b007a04.png"
     ], 
     "iris.tests.test_quickplot.TestTimeReferenceUnitsLabels.test_reference_time_units.0": [
         "https://scitools.github.io/test-iris-imagehash/images/417f8119feebeeff070054bb2b0014a0bb157ba6bb972b46dabf3b0419827b04.png", 
         "https://scitools.github.io/test-iris-imagehash/images/417f8119fefbeeff070054b92b0014a0bb557ba69b95ab46dabf3b0419827b04.png", 
         "https://scitools.github.io/test-iris-imagehash/images/417f8119fefbeeff070054bb2b0014a0bb14fbe69b952b46dabf3b0419827b04.png"
     ]
-}
\ No newline at end of file
+}
diff --git a/minimal-conda-requirements.txt b/minimal-conda-requirements.txt
index 5299e438e9..1ac665705d 100644
--- a/minimal-conda-requirements.txt
+++ b/minimal-conda-requirements.txt
@@ -4,9 +4,9 @@
 # Mandatory dependencies
 biggus
 cartopy
-matplotlib
-netcdf4
-numpy
+matplotlib<2
+netcdf4==1.2.2
+numpy<1.12
 pyke
 udunits2
 cf_units