From 79109862df1b50493a55e39c3b7c1c9d29030f60 Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Mon, 4 Sep 2017 18:25:40 +0100
Subject: [PATCH 1/2] Revert to latest normal dask version in Travis.

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ddb7c1b536..b832e55d43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,13 +82,6 @@ install:
       ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data;
     fi
 
-# Download + install dask from dask PR #2301
-  - conda uninstall --quiet dask
-  - wget https://github.com/jcrist/dask/archive/masked-array.zip;
-  - unzip masked-array.zip;
-  - cd dask-masked-array && python setup.py --quiet install;
-  - cd ..;
-
 # prepare iris build directory
   - python setup.py --with-unpack build_ext --include-dirs=${PREFIX}/include --library-dirs=${PREFIX}/lib
   - if [[ $TEST_TARGET -ne 'coding' ]]; then

From 1730963629e8d928f1f5fe210767e78c332b2764 Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Tue, 10 Oct 2017 17:25:21 +0100
Subject: [PATCH 2/2] Bump python3 test version to 3.6, to avoid netcdf build
 problem.

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

diff --git a/.travis.yml b/.travis.yml
index b832e55d43..28fc24ca19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@
 language: python
 python:
   - 2.7
-  - 3.5
+  - 3.6
 sudo: false
 
 env: