matplotlib · SidharthBansal · Mar 21, 2020 · Mar 20, 2020 · Sep 12, 2019 · Mar 21, 2020
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/travis_extra.txt"
     - PYTHON_VERSION: "3.7"
       CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
       TEST_ALL: "no"
@@ -47,49 +48,40 @@ init:
 
 install:
   - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
-  - set PYTHONUNBUFFERED=1
   - 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 "libpng>=1.6.21,<1.7" zlib=1.2 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
   - python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
     curl -sL https://github.com/python/cpython/pull/1224.patch |
     patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
 
-  # enables the local freetype build
-  - set MPLLOCALFREETYPE=1
   # Show the installed packages + versions
   - conda list
 
 test_script:
   # Now build the thing..
   - set LINK=/LIBPATH:%cd%\lib
   - pip install -ve .
-  # these should show no z, png, or freetype dll...
+  # this should show no freetype dll...
   - set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
-  - 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
-  - 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr z.*.dll && exit /b 1 || exit /b 0'
-  - 'if x%MPLSTATICBUILD% == xTrue "%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr png.*.dll && exit /b 1 || exit /b 0'
+  - '"%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
-  # missing packages on conda-forge for avconv imagemagick
+  - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex
+  # missing packages on conda-forge for imagemagick
   # This install sometimes failed randomly :-(
   #- choco install imagemagick
 
@@ -100,9 +92,8 @@ test_script:
   - pytest %PYTEST_ARGS%
 
 after_test:
-  # After the tests were a success, build wheels with the static libs
+  # After the tests were a success, build wheels.
   # Hide the output, the copied files really clutter the build log...
-  - set MPLSTATICBUILD=True
   - 'python setup.py bdist_wheel > NUL:'
   - dir dist\
   - echo finished...

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,8 +11,8 @@ version: 2.1
 apt-run:  &apt-install
   name: Install apt packages
   command: |
-    sudo apt-get -qq update
-    sudo apt-get install -y \
+    sudo apt -qq update
+    sudo apt install -y \
       inkscape \
       ffmpeg \
       dvipng \
@@ -25,35 +25,22 @@ apt-run:  &apt-install
       texlive-pictures \
       texlive-xetex \
       graphviz \
-      libgeos-dev \
       fonts-crosextra-carlito \
-      fonts-freefont-otf
+      fonts-freefont-otf \
+      fonts-humor-sans
 
 fonts-run:  &fonts-install
   name: Install custom fonts
-  # We manually install Humor-Sans using the package from Ubuntu 14.10.
-  # Unfortunately humor sans is not available in the Ubuntu version used by
-  # CircleCI but we can manually install the deb from a later version since
-  # it is basically just a .ttf file.
   command: |
     mkdir -p ~/.local/share/fonts
     wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
-    if [ ! -f ~/.local/share/fonts/Humor-Sans.ttf ]; then
-      wget http://http.us.debian.org/debian/pool/main/f/fonts-humor-sans/fonts-humor-sans_1.0-3_all.deb
-      mkdir tmp
-      dpkg -x fonts-humor-sans_1.0-3_all.deb tmp
-      cp tmp/usr/share/fonts/truetype/humor-sans/Humor-Sans.ttf ~/.local/share/fonts
-      rm -rf tmp
-    else
-      echo "Not downloading Humor-Sans; file already exists."
-    fi
     fc-cache -f -v
   save_cache:
-    key: fonts-1
+    key: fonts-2
     paths:
       - ~/.local/share/fonts/
   restore_cache:
-    key: fonts-1
+    key: fonts-2
 
 pip-run:  &pip-install
   # Upgrade pip and setuptools and wheel to get as clean an install as possible
@@ -137,6 +124,27 @@ jobs:
       - store_artifacts:
           path: doc/build/html
 
+  docs-python38:
+    docker:
+      - image: circleci/python:3.8
+    steps:
+      - checkout
+
+      - run: *apt-install
+      - run: *fonts-install
+      - run: *pip-install
+
+      - run: *deps-install
+      - run: *mpl-install
+
+      - run: *doc-build
+
+      - run: *doc-bundle
+      - store_artifacts:
+          path: doc/build/sphinx-gallery-files.tar.gz
+
+      - store_artifacts:
+          path: doc/build/html
 
       - add_ssh_keys:
           fingerprints:
@@ -155,3 +163,4 @@ workflows:
     jobs:
       - docs-python36
       - docs-python37
+      - docs-python38