From fe4b95ca4b9dad56e8d6dbc2f41629e14809190e Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Sun, 15 Sep 2019 18:06:09 +1200 Subject: [PATCH 1/2] Reorder dependencies in "azure-pipelines.yml" file. --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a99735989..543b554b77 100644 --- 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 From c6d68eb9fd25ad97ec5a0ce084e016b8feab9203 Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Sun, 15 Sep 2019 18:08:34 +1200 Subject: [PATCH 2/2] Remove pip from ".travis.yml" file requirements. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 30c403672e..75219d798f 100644 --- 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()"