From 493010d07b96697ed263dcf94481737a94cd9eec Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Mon, 12 Mar 2018 14:45:34 +0000
Subject: [PATCH 1/2] Fix iris test-data location for testing.

---
 .travis.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2a9ae8469..21ad2d9a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,7 @@ install:
 # i.e. There should be no DownloadWarning reports in the log.
   - python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'
 
-# iris test data
+# download iris test data
   - >
     if [[ "$TEST_MINIMAL" != true ]]; then
       wget --quiet -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip;
@@ -97,17 +97,16 @@ install:
       mv "iris-test-data-${IRIS_TEST_DATA_SUFFIX}" iris-test-data;
     fi
 
-# set config paths
-  - >
-    SITE_CFG=lib/iris/etc/site.cfg;
-    echo "[Resources]" > $SITE_CFG;
-    echo "test_data_dir = $(pwd)/iris-test-data/test_data" >> $SITE_CFG;
-    echo "doc_dir = $(pwd)/docs/iris" >> $SITE_CFG;
-    echo "[System]" >> $SITE_CFG;
-    echo "udunits2_path = $PREFIX/lib/libudunits2.so" >> $SITE_CFG;
+# install iris itself
 
   - python setup.py --quiet install
 
+# set test data path
+  - export OVERRIDE_TEST_DATA_REPOSITORY=$(pwd)/iris-test-data/test_data
+
+# show config in action
+  - python -c "import iris.config; print iris.config.TEST_DATA_DIR"
+
   # JUST FOR NOW : Install latest version of iris-grib.
   # TODO : remove when iris doesn't do an integration test requiring iris-grib.
   - if [[ "$TEST_MINIMAL" != true && ${TRAVIS_PYTHON_VERSION} == 2* ]]; then

From 41db75cab2dd4bcb55b225be8b24d1d490dbddd0 Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Mon, 12 Mar 2018 17:20:43 +0000
Subject: [PATCH 2/2] Python 2/3 agnostic print.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 21ad2d9a9e..cbc0f715a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -105,7 +105,7 @@ install:
   - export OVERRIDE_TEST_DATA_REPOSITORY=$(pwd)/iris-test-data/test_data
 
 # show config in action
-  - python -c "import iris.config; print iris.config.TEST_DATA_DIR"
+  - python -c "import iris.config; print(iris.config.TEST_DATA_DIR)"
 
   # JUST FOR NOW : Install latest version of iris-grib.
   # TODO : remove when iris doesn't do an integration test requiring iris-grib.