Merge branch 'feature/v0.3.14' into develop

colour-science · Sep 20, 2019 · 12379cc · 12379cc
2 parents edc4b57 + c6d68eb
commit 12379cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
   - conda update --yes --quiet conda
 
 install:
-  - conda create --yes --quiet -n colour-ci python=${PYTHON_VERSION} coverage coveralls flake8 imageio matplotlib mock nose pandas pip pyqt scipy six
+  - conda create --yes --quiet -n colour-ci python=${PYTHON_VERSION} coverage coveralls flake8 imageio matplotlib mock nose pandas pyqt scipy six
   - source activate colour-ci
   - python -c "import imageio;imageio.plugins.freeimage.download()"
 

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