From b430fcdd6d1282889515451040a47f427e646559 Mon Sep 17 00:00:00 2001
From: marqh <markh@metarelate.net>
Date: Fri, 3 Mar 2017 15:16:16 +0000
Subject: [PATCH] adopt conda-forge

---
 .travis.yml            | 4 ++--
 conda-requirements.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 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..69508d0dac 100644
--- a/conda-requirements.txt
+++ b/conda-requirements.txt
@@ -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