Merge branch 'feature/v0.3.14' into develop

.travis.yml

@@ -4,9 +4,9 @@ language: python
 matrix:
   fast_finish: true
   include:
-  - python: 3.6
+  - python: 3.7
     env:
-    - PYTHON_VERSION="3.6"
+    - PYTHON_VERSION="3.7"
   - python: 2.7
     env:
     - PYTHON_VERSION="2.7"
@@ -15,23 +15,15 @@ notifications:
   slack: colour-science:Y6lPPcN7y53Js94geqUpqsAP
 
 before_install:
-  - if [ ${TRAVIS_PYTHON_VERSION:O:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda2-3.19.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.19.0-Linux-x86_64.sh -O miniconda.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:O:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
   - chmod +x miniconda.sh
   - ./miniconda.sh -b -p /home/travis/miniconda
   - export PATH=/home/travis/miniconda/bin:$PATH
   - conda update --yes --quiet conda
-  - PACKAGES="python=${PYTHON_VERSION}"
-  - PACKAGES="${PACKAGES} imageio"; if [ ${IMAGEIO_VERSION} ]; then PACKAGES="${PACKAGES}=${IMAGEIO_VERSION}"; fi
-  - PACKAGES="${PACKAGES} matplotlib"; if [ ${MATPLOTLIB_VERSION} ]; then PACKAGES="${PACKAGES}=${MATPLOTLIB_VERSION}"; fi
-  - PACKAGES="${PACKAGES} numpy"; if [ ${NUMPY_VERSION} ]; then PACKAGES="${PACKAGES}=${NUMPY_VERSION}"; fi
-  - PACKAGES="${PACKAGES} pandas"; if [ ${PANDAS_VERSION} ]; then PACKAGES="${PACKAGES}=${PANDAS_VERSION}"; fi
-  - PACKAGES="${PACKAGES} pyqt"; if [ ${PYQT_VERSION} ]; then PACKAGES="${PACKAGES}=${PYQT_VERSION}"; fi
-  - PACKAGES="${PACKAGES} scipy"; if [ ${SCIPY_VERSION} ]; then PACKAGES="${PACKAGES}=${SCIPY_VERSION}"; fi
 
 install:
-  - conda create --yes --quiet -n colour-test ${PACKAGES} pip setuptools nose
-  - source activate colour-test
-  - pip install six coverage coveralls flake8 mock==1.0.1
+  - conda create --yes --quiet -n colour-ci python=${PYTHON_VERSION} coverage coveralls flake8 imageio matplotlib mock nose pandas pip pyqt scipy six
+  - source activate colour-ci
   - python -c "import imageio;imageio.plugins.freeimage.download()"
 
 before_script:

azure-pipelines.yml

@@ -23,9 +23,7 @@ jobs:
       architecture: 'x64'
   - script: |
       python -m pip install --upgrade pip
-      pip install imageio matplotlib numpy scipy
-      pip install pyqt
-      pip install nose six coveralls flake8 mock==1.0.1
+      pip install coveralls flake8 imageio matplotlib mock==1.0.1 nose pyqt scipy six
       python -c "import imageio;imageio.plugins.freeimage.download()"
     displayName: 'Dependencies'
   - script: flake8 colour
@@ -58,9 +56,7 @@ jobs:
       mkdir ~/.matplotlib/
       echo "backend: TkAgg" >> ~/.matplotlib/matplotlibrc
       python -m pip install --upgrade pip
-      pip install imageio matplotlib numpy scipy
-      pip install pyqt
-      pip install nose six coveralls flake8 mock==1.0.1
+      pip install coveralls flake8 imageio matplotlib mock==1.0.1 nose pyqt scipy six
       python -c "import imageio;imageio.plugins.freeimage.download()"
     displayName: 'Dependencies'
   - script: flake8 colour