Update

.github/deploy_key.scitools-docs.enc

@@ -0,0 +1 @@
+gAAAAABZSMeGIlHxHu4oCV_h8shbCRf1qJYoLO9Z0q9uKRDTlytoigzlvfxhN-9WMjc3Js1f1Zg55PfEpTOpL82p6QHF-gqW0k0qGjanO3lnQzM6EzIu3KyJPrVrL-O6edwoPMYKqwsNO3VQHNuEspsFKY0TbjnTPHc45SPU5LjEGX4c_SADSDcLDJm2rbrU2eVkT-gFHy_-ZzK0Di83WlDc79YzIkVe5BAn5PbWv3O9BROR4fJzecbjmWRT_rp1cqI_gaUpVcwTdRK3II9YnazBtW4h2WbCeTcySLD7N4o9K0P71SR6gG_XFbpML3Haf5IUdRi0qPBuvJ_4YVnnuJo6mhiIOJfUEcNj_bbLOYVzPmKyQMHvrPf_lK5JhdX6MUvqluhqHuc0i_z_j1O2y32lB7b1iiY6eE_BsNlXJHlOX1GiXkX0nZLI48p-D22jya44WshWSnVcoalcCDkdbvdFbpOscwXDR3nB-PCOmRUF_d1BlMbp1if-VP0yt3tJ_5yyCrqSRWwFusaibQTF6yoImetl7Am95hh2FjFDNkalHqtarnUv86w-26v1ukcTIjJ0iHzNbCK1m0VMkvE6uDeqRgIZnVKON5cesmM3YbulRrHpaOiSly_sMhLhfg5jTxAuOa319AQGoHEOcRLRUYdw2TQkDEiHGiUh_U4-nC7GTGDGcXyeBIa4ciuC2Qi0QXf9qyEGoIRcU8BP34LDNdtovJoZOBDzhr5Ajnu7yA3GB3TD_kiZrgm6agFuu7a51OMfjezhwGzUJ4X-empPctwm9woOJmPCTFqCvxB2VwVV0L6yngsTooyAHCi5st_AG-p5FIT3VZGx7EgCd68ze9XlRoACoe9XOdSFklbaSMGRbJlvKCPAA0zj4__PfIhlD8Cxwwjq_VXlSr_QxygIGZJlhkT46P9TroolgdipaBp1aQ3_PKHfgw5Y9ZqBKCZF5DOJejqUbfVKUp2JdqoX3yQBD0ByQFdfCuLvoiYcM2ofKdIMvel3Jwn0Nx4NYR2qg3h7FYti0jdrNlC89gnL4tKsf0DAGxZ1UYmqQMWJ3-GKCKrlKyeaHYB2djPRGP8VeoRZh_UorSNHU56KSztK_hTP6P0nFymRJRUSRBMKTaTfJf1aBlk9zJHSe9hOKwxyUNkwcTftGn5P0WNcnaTk3ecTVe-1QJKbPWwMBDzqQtTCsCizgN4UdQsmy4iMYq-LT2TC-JXXo0CPTNDybUj92wSa7KeKTvKnbN8DMZbGRdgy5BOSGw4hMIoIFSB-6tnBIvTntNfMT9ac9e9jKm47Q4qXpaeF3AsvBqxkMRQLaYVppPng6cA49VjJQDZ0gTdPKSSKZkApfeeQL0LLCGwzQ4C52TWK2NJSQ3pvRYI1F0taDQWopIiwFfox-OSYnOJECHkHjxaxhHQzVb3w47xKKZNXbLb-LV7QI-kGuKLfoqO1lq94cw1H-EVrXaGJcDDLjK2jRgdVfDyPsHMcW1oUDJqu8gQ6fCXYPbqJzdmFNFsc1hywHWCU7crV61D2QubwzbLRnP8053MvsMnbdhWtwocTlvvdG-qW6CiEA9Eanfpf0RW1W9oh6yQJ__0vS9UWswqq5ahkkpHY9LTE0US4L3xbFOrq7HgbA2jelTdPVfxo3BfUHuL8oKpFDTzgZi07gNmkhIZfpuXj2KFnm9XM31AsY6V2rXL0xSx-9rvi4FP0LK6V5vQ8OKI8aRPCDyzLUv2xnayMW4yaYg3GHD5yo7pIOswKc6GOEmetPnay3j0dVN3hfpkpfJWhss3vjZ2Zl0NmjJ7OuS25tjUGLy82A1yFSpL8mKRkHZJuMDZbd_Or6gaPVoVT_Otbkh-6pMZuDeOHOUfgey0Z374jCjRpyQ9k-Fpw8ykow8iIIQ088kC5CeQy6jRhD7mO3iR4-U1XKDJQNlNg1z_JYyDrwykp7FFN2sQn7RRYHIXx2iMrEDXdrdTrujMFN6omC13yDuXJukAgZb6zBBUTlonxRUBjUJWt2P-1sRRTsG8mr9EaE5K-xhR5Ust_37L3svNQ0vwLtPLIpWGZHhD8P_dYNR2RL4679xyzI8A7wLY82wFBHrcghAd4UtLJH9ul6IuS_CaVo-gbfowNRaQ0Zw7WHZGIXpZWEx1_zck6qDEaCY8TpQeciBWpH5uJDSYqdLdMwigdQEGzAJ1DHSWsyTrmOR7Lhwi9WqOzfWe4ahxAkAUH_Jdr_i-nGfl_x3OgQdHM7jWVMXDcXEmR0bkw-s0EKXCn20q2bxDkm5SUWkYtWAZ2aZRgo4wHOqGBcP99xZ25mq9uxtNOkLBF81lnVbn_4BAZBNnnKwwj4SafeIW4KR1ZOpnEI47sGUR6NhEk9VtJsv0zeZIv8VjRbNLh3QCxkNMue60SjJ48kjotZSX1RQJN0xwPftiABBf8MX9tyZe8emQvPeIcdQTSQPnYEUx22xZGeeJTNrZ9soQyP6mrkkRihp6o9tG7HT9QEVLGM19wAigwAAMMXGqdGzWwpar30JtJU94gAmIlwFUJqeO_fdJKFspnUyJ6gt5_oHsKNEV7Uz5EJwGpa94tlPJXjvZpu-wWQfu8U0trTU2mTCA0bmZIDID-Xk4vCW_SD4OVnsvWyga4QHSg3AqVTjnjlapAjsYcFjiOo2C_U3besloprpyuAwpTdn7zdfMHIJO0ckBFnXlk8XB3kT0YGrCpBvW6gYMXlnePVcr3wJehCvMg1Q9Dc5fVQUqt65zcjbgiudfzFGtTe9T4f1IttoAtrJgTN4W1mtbZzSK864I_ngaX5YWgZSinjkbocCCFEJDcbiXMnV7OWOZefqW6VZu4BZKEKlN9k2kH3UCECCK3uRAQIPn_48DgaVnAff2-fMADltiosSPJ_a3057acJP0cf-1QsJuV7r3zdzL3shgrMRjpSsSTCYdMhZ6disFGcJg7hJJvtH1FieZ76jps5FYi5lE8Ua9yBKlG4dCGuUBnikvpfy2FLMLFNn-iXLflu2oiBbcLvn_ReZUnFIR6KgGRN8xKEBaXATQVtb2E678GtQptK8PHP2DoAtbsIXUDn60YH04D9pEck8NnmWYAz7sWbiL6OKdaO7jQep4mt3CgkyFC0NCKP9zCbVNtmfHRVmHtckjgfHF-tK_v59KeAuwWPtm7ow2BjynAK42IGR9nWtQFRUZIboaND8UF76YGKFF7kOf_XTvoNrVTCRkD6b8KJy2IFfdoHP6WET9QLvwDSXgYLPlCX9z7aQ_lc57u5d_dGO-7NZ_Qbs69ByyIvQoztVBjw6fa7EzSwccqPfMQL_fiecNCng-r4gHaH6TlgSbfqQOISHxTtvmbym1no560ZsHfnQfuL6BCI8s6OoygxhOnQhaDqyOUVBut_x3VR_DKFMyUazXYNgLbRsdITaAvR-0gIx5TAX9n3A4HwHuiBZCtwRYaiJnW8FX9lk1Y_g5UHL2OC3rsNFui3aBLzAFhx58lALxnxhlUItuHHK9BgexnR2yCj2nOWLoWQzfFaf2_fpjEh_QBHTqUxdQZ8ighg_8lh6hmLbW4PcUxKX71RFmikLyS3-idlzsiEomNlPNaVllRF21vE6dR-nZ6xsxzTvNB4wumP2irQ9mFBTN1WpiLMyNoEEucA2I848YHUfkZrjTG_dcCQNp7H_2gKdIsZ135lUEG6lYfhLMHTmP5uYxxx3Pipjp6wF2GFCsZPIlIPsgrhbSxqkWg1EOViHtpw6ypFKn7wQHHfnrnHkFWnrKbMARVBjJUB-FhK4b6qLU_k_MTMipemneMUFXlj3EkEhKM18MIHGkIOkwG5QtPYcjUAf_2sZlxSMVnh6sQ8kVwF6lfk_l8jhoO93HUTntZUSv7GrE3s80yJgII4Qw37AdgcJiAkoPn1-17HfSsAy6uRh5-OvrCtkDqQxfuJSyn_4pRMh6hZT7N9pI5limMXXn2nHnxU93UT3qU-smA8q0ECfvK3JwoaYy_llSx0wSBvpmxjLQ302sFYM5FVZ9zRbHuLCCZShVopiyMDLHVJe_1g9Ou1KL-h6RVZgg3Ttyb5m2KDfoHEVLeZkW81YLCsyo7uNb6SVRM-615TIVGT6Eq7oJ6wO2LMDKjEpHKFiOFpY2fpR8noM81UqgLddYfl_lei7RVjaNO98otqE4iSNtpgJgyhAx4CdYm__yQRSXhckR4K7yAhM9Kh5BLbQQnf2_0WS1sWTmNMZZNMfOSqmTCRVwcYvg4TDGOA-vZARbZW1M7npVMldV_SbvgcEZD6InY9c40eheRqS0YD2W2HEZIiNeLRw0y5WBcYuJIpXhI3ViTXx-frJnv0Mo9uwmuLbJmWFcn6RdIVcU68_oPZZlZD4Vm7SjikbuZKF1BF3lXamTTDIBcWiDLwuNDv2lUkURDCWa5WJsfUCfTAJ6PTe8=

.gitignore

@@ -1,7 +1,10 @@
 *.py[co]
 
+# Environment file which should be autogenerated
+*conda_requirements.txt*
+
 # Packages
-*.egg
+*.egg?
 *.egg-info
 dist
 build
@@ -15,10 +18,12 @@ develop-eggs
 
 # Installer logs
 pip-log.txt
+pip-cache
 
 # Unit test / coverage reports
 .coverage
 .tox
+.pytest_cache
 
 #Translations
 *.mo
@@ -31,17 +36,30 @@ lib/iris/std_names.py
 
 # Iris test result files
 lib/iris/tests/result_image_comparison/
+iris_image_test_output/
+*.ESMF_LogFile
+
+# Iris test lock file
+lib/iris/tests/results/imagerepo.lock
 
 # Pydev/Eclipse files
 .project
 .pydevproject
 .settings
 
+# PyCharm files
+/.idea
+*.cover
+
 # Auto generated documentation files
 docs/iris/src/_static/random_image.js
 docs/iris/src/_templates/gallery.html
 docs/iris/src/examples/
 docs/iris/src/iris/
+docs/iris/src/matplotlibrc
+
+# Example test results
+docs/iris/iris_image_test_output/
 
 # Created by editiors
 *~

.mailmap

@@ -0,0 +1,13 @@
+Mark Hedley <[email protected]>             <[email protected]>
+Mark Hedley <[email protected]>             <[email protected]>
+Ed Campbell <[email protected]>            <[email protected]>
+Andrew Dawson <[email protected]>                <[email protected]>
+Andrew Dawson <[email protected]>                <[email protected]>
+Andrew Dawson <[email protected]>                <[email protected]>
+Ian Edwards <[email protected]>            <[email protected]>
+Danny Rice <[email protected]>              <[email protected]>
+<[email protected]>                   <[email protected]>
+Laura Dreyer <[email protected]>    <[email protected]>
+<[email protected]>                 <[email protected]>
+Ruth Comer <[email protected]>        <[email protected]>
+<[email protected]>               <[email protected]>

.stickler.yml

@@ -0,0 +1,6 @@
+linters:
+    flake8:
+
+files:
+    ignore:
+        - 'lib/iris/fileformats/um_cf_map.py'

.travis.yml

@@ -1,143 +1,167 @@
-#
-# Based on pelson's travis work for cartopy.
-#
-# Please update the cartopy, test data, and sample data git references below if appropriate.
+# Please update the test data git references below if appropriate.
 #
 # Note: Contrary to the travis documentation,
 # http://about.travis-ci.org/docs/user/languages/python/#Travis-CI-Uses-Isolated-virtualenvs
-# we will use the system python because it takes too long to install scipy from source.
-#
+# we will use conda to give us a much faster setup time.
 
 
 language: python
 python:
   - 2.7
+  - 3.6
+sudo: false
+
+env:
+  matrix:
+    - TEST_TARGET=default TEST_MINIMAL=true
+    - TEST_TARGET=default
+    - TEST_TARGET=example
+    - TEST_TARGET=doctest
+
+  global:
+    # The decryption key for the encrypted .github/deploy_key.scitools-docs.enc.
+    - secure: "N9/qBUT5CqfC7KQBDy5mIWZcGNuUJk3e/qmKJpotWYV+zwOI4GghJsRce6nFnlRiwl65l5oBEcvf3+sBvUfbZqh7U0MdHpw2tHhr2FSCmMB3bkvARZblh9M37f4da9G9VmRkqnyBM5G5TImXtoq4dusvNWKvLW0qETciaipq7ws="
 
 git:
-  depth: 0
+  # We need a deep clone so that we can compute the age of the files using their git history.
+  depth: 10000
 
 install:
-
-  - export BIGGUS_REF="da8f19f197adff77e8071b0e04269c8b888a1fbf"
-  - export BIGGUS_SUFFIX=$(echo "${BIGGUS_REF}" | sed "s/^v//")
-
-  - export CARTOPY_REF="v0.10.0"
-  - export CARTOPY_SUFFIX=$(echo "${CARTOPY_REF}" | sed "s/^v//")
-
-  - export IRIS_TEST_DATA_REF="3378fe68c00ca7f31895ab6630a59a39ccef94e3"
-  - export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//")
-
-  - export IRIS_SAMPLE_DATA_REF="2e7c73504e3d675d97dc8a2c2939f9fd2cfe51f1"
-  - export IRIS_SAMPLE_DATA_SUFFIX=$(echo "${IRIS_SAMPLE_DATA_REF}" | sed "s/^v//")
-
-# Switch off virtualenv so we can use apt-get for Python packages.
-  - deactivate
-
-# add repo
-  - ./.travis_no_output sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3E5C1192
-  - ./.travis_no_output sudo add-apt-repository -y ppa:ubuntugis/ppa
-# access to scipy 0.12.0 https://launchpad.net/~pylab/+archive/stable
-  - sudo add-apt-repository -y ppa:pylab/stable
-  - ./.travis_no_output sudo apt-get update
-
-# install deps
-  - ./.travis_no_output sudo apt-get install python-scipy cython python-pip
-  - ./.travis_no_output sudo /usr/bin/pip install numpy==1.7.2
-  - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors shapely nose
-  - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors pyshp pep8 mock
-  - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors setuptools
-  - ./.travis_no_output sudo /usr/bin/pip install matplotlib==1.3.1
-  - ./.travis_no_output sudo apt-get install libgeos-dev libproj-dev
-  - ./.travis_no_output sudo apt-get install libudunits2-dev libhdf5-serial-dev netcdf-bin libnetcdf-dev
-  - ./.travis_no_output sudo apt-get install make unzip python-sphinx graphviz
-  - ./.travis_no_output sudo /usr/bin/pip install netCDF4==1.0.2
-  - ./.travis_no_output sudo /usr/bin/pip install pyke
-  - ./.travis_no_output sudo /usr/bin/pip install pandas==0.12.0
-  - ./.travis_no_output sudo apt-get install openjdk-7-jre
-  - sudo apt-get install python-gdal
-  - export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server:$LD_LIBRARY_PATH
-
-# cfchecker
-  - ./.travis_no_output sudo /usr/bin/pip install cdat-lite
-# cfchecker via pip normally works, but we've found the pip interface to fail intermittently,
-# therefore we specify the full download url.
-#  - ./.travis_no_output sudo /usr/bin/pip install cfchecker
-  - ./.travis_no_output sudo /usr/bin/pip install https://pypi.python.org/packages/source/c/cfchecker/cfchecker-2.0.3.tar.gz#md5=54e780e8688ac743d1e21448a3901061
-
-  - echo '#!/usr/bin/env sh' > cfchecker
-  - echo "cfchecks -s `pwd`/etc/cf-standard-name-table.xml -a `pwd`/etc/area-type-table.xml -u /usr/share/xml/udunits/udunits2.xml \$1" >> cfchecker
-  - ./.travis_no_output sudo cp cfchecker /usr/local/bin/cfchecker
-  - ./.travis_no_output sudo chmod a+x /usr/local/bin/cfchecker
-
-# grib api
-  - ./.travis_no_output sudo apt-get install libjasper-dev
-  - ./.travis_no_output sudo apt-get build-dep libgrib-api-1.9.9 libgrib-api-dev libgrib-api-tools
-  - ./.travis_no_output wget https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.9.16.tar.gz --no-check-certificate
-  - ./.travis_no_output tar -xvf grib_api-1.9.16.tar.gz
-  - cd grib_api-1.9.16/
-  - ../.travis_no_output CFLAGS="-fPIC" ./configure --with-jasper=/usr/local/lib --disable-fortran --enable-python
-  - ../.travis_no_output make
-  - ../.travis_no_output sudo make install
-  - cd python
-  - ../../.travis_no_output sudo /usr/bin/python setup.py install
-  - cd ../..
-
-# biggus
-  - ./.travis_no_output wget -O biggus.zip https://github.com/SciTools/biggus/archive/${BIGGUS_REF}.zip
-  - ./.travis_no_output unzip -q biggus.zip
-  - ln -s $(pwd)/biggus-${BIGGUS_SUFFIX} biggus
-  - cd biggus
-  - ../.travis_no_output /usr/bin/python setup.py install --user
-  - cd ..
-
-# cartopy
-  - ./.travis_no_output wget -O cartopy.zip https://github.com/SciTools/cartopy/archive/${CARTOPY_REF}.zip
-  - ./.travis_no_output unzip -q cartopy.zip
-  - ln -s $(pwd)/cartopy-${CARTOPY_SUFFIX} cartopy
-  - cd cartopy
-  - ../.travis_no_output /usr/bin/python setup.py install --user
-  - cd ..
+  - >
+    export IRIS_TEST_DATA_REF="2f3a6bcf25f81bd152b3d66223394074c9069a96";
+    export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//");
+
+  # Cut short doctest phase under Python 2 : now only supports Python 3
+  # SEE : https://github.com/SciTools/iris/pull/3134
+  # ------------
+  - >
+    if [[ $TEST_TARGET == 'doctest' && ${TRAVIS_PYTHON_VERSION} != 3* ]]; then
+        echo "DOCTEST phase only valid in Python 3 : ABORTING during 'install'."
+        exit 0
+    fi
+
+  # Install miniconda
+  # -----------------
+  - >
+    echo 'Installing miniconda';
+    export CONDA_BASE=https://repo.continuum.io/miniconda/Miniconda;
+    if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
+      wget --quiet ${CONDA_BASE}2-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget --quiet ${CONDA_BASE}3-latest-Linux-x86_64.sh -O miniconda.sh;
+    fi;
+    bash miniconda.sh -b -p $HOME/miniconda;
+    export PATH="$HOME/miniconda/bin:$PATH";
+
+  # Create the basic testing environment
+  # ------------------------------------
+  # Explicitly add defaults channel, see https://github.com/conda/conda/issues/2675
+  - >
+    echo 'Configure conda and create an environment';
+    conda config --set always_yes yes --set changeps1 no;
+    conda config --set show_channel_urls True;
+    conda config --add channels conda-forge;
+    conda update --quiet conda;
+    ENV_NAME='test-environment';
+    conda create --quiet -n $ENV_NAME python=$TRAVIS_PYTHON_VERSION pip;
+    source activate $ENV_NAME;
+
+  # Customise the testing environment
+  # ---------------------------------
+  - >
+    echo 'Install Iris dependencies';
+    CONDA_REQS_FLAGS="";
+    CONDA_REQS_GROUPS="test";
+    if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
+        CONDA_REQS_FLAGS="${CONDA_REQS_FLAGS} --py2";
+    fi;
+    if [[ "$TEST_MINIMAL" != true ]]; then
+        CONDA_REQS_GROUPS="${CONDA_REQS_GROUPS} all";
+    fi;
+    if [[ "${TEST_TARGET}" == 'doctest' ]]; then
+        CONDA_REQS_GROUPS="${CONDA_REQS_GROUPS} docs";
+    fi;
+    CONDA_REQS_FILE=conda-requirements.txt;
+    python requirements/gen_conda_requirements.py ${CONDA_REQS_FLAGS} --groups ${CONDA_REQS_GROUPS} > ${CONDA_REQS_FILE};
+    cat ${CONDA_REQS_FILE};
+    conda install --quiet -n $ENV_NAME --file ${CONDA_REQS_FILE};
+
+  - PREFIX=$HOME/miniconda/envs/$ENV_NAME
+
+  # Output debug info
+  - >
+    conda list -n $ENV_NAME;
+    conda list -n $ENV_NAME --explicit;
+    conda info -a;
 
 # Pre-load Natural Earth data to avoid multiple, overlapping downloads.
 # i.e. There should be no DownloadWarning reports in the log.
-  - /usr/bin/python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'
-
-# mo_unpack
-  - ./.travis_no_output wget https://puma.nerc.ac.uk/trac/UM_TOOLS/raw-attachment/wiki/unpack/unpack-030712.tgz
-  - ./.travis_no_output tar -xf unpack-030712.tgz
-  - cd unpack-030712/libmo_unpack
-#?  - gcc -c -fPIC -O4 -mfpmath=sse -msse -I include -D_LARGEFILE_SOURCE -D_LARGEFILE_SOURCE64 -D_FILE_OFFSET_BITS=64 *.c
-  - ../../.travis_no_output gcc -c -fPIC -O4 -mfpmath=sse -msse -I include -D_LARGEFILE_SOURCE *.c
-  - ../../.travis_no_output gcc -shared -Wl,-soname,libmo_unpack.so -o lib/libmo_unpack.so *.o
-  - ../../.travis_no_output sudo cp lib/* /usr/local/lib
-  - ../../.travis_no_output sudo cp include/* /usr/local/include
-  - cd ../..
+  - python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'
 
 # iris test data
-  - ./.travis_no_output wget -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip
-  - ./.travis_no_output unzip -q iris-test-data.zip
-  - ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data
-
-# iris sample data
-  - ./.travis_no_output wget -O iris-sample-data.zip https://github.com/SciTools/iris-sample-data/archive/${IRIS_SAMPLE_DATA_REF}.zip
-  - ./.travis_no_output unzip -q iris-sample-data.zip
-  - ln -s $(pwd)/iris-sample-data-${IRIS_SAMPLE_DATA_SUFFIX} iris-sample-data
-
-# iris
-  - ./.travis_no_output /usr/bin/python setup.py --with-unpack build_ext --inplace -I/usr/local/include -L/usr/local/lib -R/usr/local/lib
-  - ./.travis_no_output /usr/bin/python setup.py std_names
-  - echo "[Resources]" > lib/iris/etc/site.cfg
-  - echo "sample_data_dir = $(pwd)/iris-sample-data/sample_data" >> lib/iris/etc/site.cfg
-  - echo "test_data_dir = $(pwd)/iris-test-data/test_data" >> lib/iris/etc/site.cfg
-  - ln -s $(pwd)/lib/iris /home/travis/.local/lib/python2.7/site-packages/iris
-  - ./.travis_no_output /usr/bin/python setup.py pyke_rules
+  - >
+    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;
+      unzip -q iris-test-data.zip;
+      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;
+
+  - python setup.py --quiet install
+
+  # 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
+        conda install --quiet -n $ENV_NAME python-ecmwf_grib;
+        pip install git+https://github.com/SciTools/[email protected];
+    fi
 
 script:
-  - /usr/bin/python setup.py test --example-tests
-
-  - cd $(pwd)/docs/iris
-# Make html produces an error when run on Travis that does not affect any downstream functionality but causes the build to fail spuriously.
-# The following gets around this error, which should be investigated further in the future.
-  - echo `make clean html`
-
-  - make doctest
+  - if [[ $TEST_TARGET == 'default' ]]; then
+      python -m iris.tests.runner --default-tests --system-tests --coding-tests --print-failed-images --num-processors=3;
+    fi
+  - if [[ $TEST_TARGET == 'example' ]]; then
+      python -m iris.tests.runner --example-tests --print-failed-images --num-processors=3;
+    fi
+
+  # Capture install-dir: As a test command must be last for get Travis to check
+  # the RC, so it's best to start each operation with an absolute cd.
+  - INSTALL_DIR=$(pwd)
+
+  - >
+    if [[ $TEST_TARGET == 'doctest' ]]; then
+      MPL_RC_DIR=$HOME/.config/matplotlib;
+      mkdir -p $MPL_RC_DIR;
+      echo 'backend : agg' > $MPL_RC_DIR/matplotlibrc;
+      echo 'image.cmap : viridis' >> $MPL_RC_DIR/matplotlibrc;
+      cd $INSTALL_DIR/docs/iris;
+      make clean html && make doctest;
+    fi
+
+  # Split the organisation out of the slug. See https://stackoverflow.com/a/5257398/741316 for description.
+  - ORG=(${TRAVIS_REPO_SLUG//\// })
+
+  # When we merge a change, and we are running in python 3, push some docs. 
+  - if [[ $TEST_TARGET == 'doctest' && ${TRAVIS_EVENT_TYPE} == 'push' && ${TRAVIS_PYTHON_VERSION} == 3* && ${ORG} == "SciTools" ]]; then
+      cd $INSTALL_DIR;
+      pip install doctr;
+      doctr deploy --deploy-repo SciTools-docs/iris --built-docs docs/iris/build/html
+        --key-path .github/deploy_key.scitools-docs.enc
+        --no-require-master
+        ${TRAVIS_BRANCH:-${TRAVIS_TAG}};
+    fi
+
+  # An extra call to check "whatsnew" contributions are valid, because the
+  # Iris test for it needs a *developer* install to be able to find the docs.
+  - if [[ $TEST_TARGET == 'doctest' ]]; then
+      cd $INSTALL_DIR/docs/iris/src/whatsnew;
+      python aggregate_directory.py --checkonly;
+    fi