Merge pull request #16117 from Kojoley/ci-appveyor-unify-reqs

anntzer · web-flow · commit db8cdf21d995 · 2020-01-17T10:34:05.000+01:00
CI: Unify required dependencies installation
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -26,6 +26,7 @@ environment:
     - PYTHON_VERSION: "3.6"
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
       TEST_ALL: "no"
+      EXTRAREQS: "-r requirements/testing/travis36.txt"
     - PYTHON_VERSION: "3.7"
       CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
       TEST_ALL: "no"
@@ -48,22 +49,18 @@ init:
 install:
   - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
   - conda config --set always_yes true
-  - conda update --all
   - conda config --set show_channel_urls yes
   - conda config --prepend channels conda-forge
-  # this is now the downloaded conda...
-  - activate
-  - conda info -a
-
-  # For building, use a new environment which only includes the requirements for mpl
-  # if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
-  # https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
-  - conda create -q -n test-environment python=%PYTHON_VERSION%
-    freetype=2.6 tk=8.5
-    pip setuptools numpy sphinx tornado
+
+  # For building, use a new environment
+  - conda create -q -n test-environment python=%PYTHON_VERSION% tk
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
-  - pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt
+  # Install dependencies from PyPI.
+  - python -mpip install --upgrade -r requirements/testing/travis_all.txt %EXTRAREQS% %PINNEDVERS%
+  # Install optional dependencies from PyPI.
+  # Sphinx is needed to run sphinxext tests
+  - python -mpip install --upgrade sphinx
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176
@@ -83,7 +80,7 @@ test_script:
   - '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
 
   # this are optional dependencies so that we don't skip so many tests...
-  - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
+  - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex
   # missing packages on conda-forge for avconv imagemagick
   # This install sometimes failed randomly :-(
   #- choco install imagemagick
diff --git a/.travis.yml b/.travis.yml
@@ -133,6 +133,8 @@ install:
     python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt $EXTRAREQS $PINNEDVERS
   - |
     # Install optional dependencies from PyPI.
+    # Sphinx is needed to run sphinxext tests
+    python -mpip install --upgrade sphinx
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # install was successful by trying to import the toolkit (sometimes, the
