matplotlib · QuLogic · Feb 19, 2021 · Feb 19, 2021 · Feb 19, 2021 · Feb 19, 2021
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -62,10 +62,10 @@ install:
   - conda install -c conda-forge pywin32
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # Install dependencies from PyPI.
-  - python -mpip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS%
+  - python -m pip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS%
   # Install optional dependencies from PyPI.
   # Sphinx is needed to run sphinxext tests
-  - python -mpip install --upgrade sphinx
+  - python -m pip install --upgrade sphinx
   # Show the installed packages + versions
   - conda list
 

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,9 +54,9 @@ commands:
       - run:
           name: Upgrade pip, setuptools, wheel
           command: |
-            python -mpip install --upgrade --user pip
-            python -mpip install --upgrade --user wheel
-            python -mpip install --upgrade --user setuptools
+            python -m pip install --upgrade --user pip
+            python -m pip install --upgrade --user wheel
+            python -m pip install --upgrade --user setuptools
 
   deps-install:
     parameters:
@@ -67,14 +67,15 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
-            python -mpip install --user numpy<< parameters.numpy_version >> codecov coverage
-            python -mpip install --user -r requirements/doc/doc-requirements.txt
+            python -m pip install --user \
+                numpy<< parameters.numpy_version >> codecov coverage \
+                -r requirements/doc/doc-requirements.txt
 
   mpl-install:
     steps:
       - run:
           name: Install Matplotlib
-          command: python -mpip install --user -ve .
+          command: python -m pip install --user -ve .
 
   doc-build:
     steps:

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -12,11 +12,24 @@ jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    env:
+      min-numpy-version: "1.16.0"
+      min-numpy-hash: "04/b6/d7faa70a3e3eac39f943cc6a6a64ce378259677de516bd899dd9eb8f9b32"
     strategy:
       matrix:
         os: [ubuntu-18.04, windows-latest, macos-latest]
+        cibw_archs: ["auto"]
+        include:
+          - os: ubuntu-18.04
+            cibw_archs: "aarch64"
 
     steps:
+      - name: Set up QEMU
+        if: matrix.cibw_archs == 'aarch64'
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -26,9 +39,26 @@ jobs:
         with:
           python-version: '3.7'
 
+      - uses: actions/cache@v2
+        id: numpy-cache
+        with:
+          path: numpy-aarch64-cache/
+          key: numpy-${{ matrix.cibw_archs }}-cache-${{ env.min-numpy-version }}
+
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==1.6.3
+          python -m pip install cibuildwheel==1.9.0
+
+      - name: Build minimum NumPy for aarch64
+        if: matrix.cibw_archs == 'aarch64' && steps.numpy-cache.outputs.cache-hit != 'true'
+        run: |
+          wget https://files.pythonhosted.org/packages/${{ env.min-numpy-hash }}/numpy-${{ env.min-numpy-version }}.zip
+          unzip numpy-${{ env.min-numpy-version }}.zip
+          cd numpy-${{ env.min-numpy-version }}
+          python -m cibuildwheel --output-dir ../numpy-aarch64-cache
+        env:
+          CIBW_BUILD: "cp36-* cp37-* cp38-*"
+          CIBW_ARCHS: aarch64
 
       - name: Copy setup.cfg to configure wheel
         run: |
@@ -43,17 +73,18 @@ jobs:
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
           CIBW_BEFORE_BUILD: pip install certifi numpy==1.19.3
           MPL_DISABLE_FH4: "yes"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython
         run: |
           python -m cibuildwheel --output-dir dist
         env:
-          CIBW_BUILD: "cp3?-*"
-          CIBW_SKIP: "cp35-* cp36-* cp39-*"
+          CIBW_BUILD: "cp37-* cp38-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
+          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
           MPL_DISABLE_FH4: "yes"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.6
         run: |
@@ -62,8 +93,9 @@ jobs:
           CIBW_BUILD: "cp36-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
+          CIBW_BEFORE_BUILD: pip install certifi; pip install --find-links=numpy-aarch64-cache/ numpy==${{ env.min-numpy-version }}
           MPL_DISABLE_FH4: "yes"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
         if: >
           startsWith(github.ref, 'refs/heads/v3.3') ||
           startsWith(github.ref, 'refs/tags/v3.3')
@@ -73,7 +105,8 @@ jobs:
           python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "pp3?-*"
-          CIBW_BEFORE_BUILD: pip install certifi numpy==1.16
+          CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
         if: >
           runner.os != 'Windows' && (
           startsWith(github.ref, 'refs/heads/v3.3') ||

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -137,17 +137,17 @@ jobs:
         run: |
           # Upgrade pip and setuptools and wheel to get as clean an install as
           # possible.
-          python -mpip install --upgrade pip setuptools wheel
+          python -m pip install --upgrade pip setuptools wheel
 
           # Install dependencies from PyPI.
-          python -mpip install --upgrade $PRE \
+          python -m pip install --upgrade $PRE \
             cycler kiwisolver numpy pillow pyparsing python-dateutil \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}
 
           # Install optional dependencies from PyPI.
           # Sphinx is needed to run sphinxext tests
-          python -mpip install --upgrade sphinx
+          python -m pip 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
@@ -160,8 +160,8 @@ jobs:
             # pycairo 1.20+ requires a new version of Cairo, unavailable on
             # Ubuntu 16.04, so PyGObject must be installed without build
             # isolation in order to pick up the lower pre-installed version.
-             python -mpip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
-             python -mpip install --upgrade --no-build-isolation PyGObject &&
+             python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
+             python -m pip install --upgrade --no-build-isolation PyGObject &&
                python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
                echo 'PyGObject is available' ||
                echo 'PyGObject is not available'
@@ -170,16 +170,16 @@ jobs:
             # Sept 2020) for either pyqt5 (there are only wheels for 10.13+) or
             # pyside2 (the latest version (5.13.2) with 10.12 wheels has a
             # fatal to us bug, it was fixed in 5.14.0 which has 10.13 wheels)
-             python -mpip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
+             python -m pip install --upgrade pyqt5${{ matrix.pyqt5-ver }} &&
                python -c 'import PyQt5.QtCore' &&
                echo 'PyQt5 is available' ||
                echo 'PyQt5 is not available'
-             python -mpip install --upgrade pyside2 &&
+             python -m pip install --upgrade pyside2 &&
                python -c 'import PySide2.QtCore' &&
                echo 'PySide2 is available' ||
                echo 'PySide2 is not available'
           fi
-          python -mpip install --upgrade \
+          python -m pip install --upgrade \
             -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
             wxPython &&
             python -c 'import wx' &&
@@ -199,7 +199,7 @@ jobs:
 
           # All dependencies must have been pre-installed, so that the minver
           # constraints are held.
-          python -mpip install --no-deps -e .
+          python -m pip install --no-deps -e .
 
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
             unset CPPFLAGS

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -31,8 +31,8 @@ precompiled wheel for your OS and Python.
    TkAgg.
 
    For support of other GUI frameworks, LaTeX rendering, saving
-   animations and a larger selection of file formats, you need to
-   install :ref:`additional dependencies <install_requirements>`.
+   animations and a larger selection of file formats, you can
+   install :ref:`optional_dependencies`.
 
 Although not required, we suggest also installing ``IPython`` for
 interactive use.  To easily install a complete Scientific Python
@@ -73,6 +73,8 @@ If you are interested in contributing to Matplotlib development,
 running the latest source code, or just like to build everything
 yourself, it is not difficult to build Matplotlib from source.
 
+First you need to install the :ref:`dependencies`.
+
 A C compiler is required.  Typically, on Linux, you will need ``gcc``, which
 should be installed using your distribution's package manager; on macOS, you
 will need xcode_; on Windows, you will need Visual Studio 2015 or later.
@@ -135,149 +137,6 @@ file will be particularly useful to those packaging Matplotlib.
 
 .. _setup.cfg: https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template
 
-.. _install_requirements:
-
-Dependencies
-------------
-
-Matplotlib will automatically install dependencies when you install with
-``pip``, so this section is mostly for your reference.
-
-Matplotlib requires the following dependencies:
-
-* `Python <https://www.python.org/downloads/>`_ (>= 3.7)
-* `NumPy <https://numpy.org>`_ (>= 1.16)
-* `setuptools <https://setuptools.readthedocs.io/en/latest/>`_
-* `cycler <https://matplotlib.org/cycler/>`_ (>= 0.10.0)
-* `dateutil <https://pypi.org/project/python-dateutil>`_ (>= 2.7)
-* `kiwisolver <https://github.com/nucleic/kiwi>`_ (>= 1.0.1)
-* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>= 6.2)
-* `pyparsing <https://pypi.org/project/pyparsing/>`_ (>=2.2.1)
-
-Optionally, you can also install a number of packages to enable better user
-interface toolkits. See :ref:`what-is-a-backend` for more details on the
-optional Matplotlib backends and the capabilities they provide.
-
-* Tk_ (>= 8.3, != 8.6.0 or 8.6.1): for the Tk-based backends.
-* PyQt4_ (>= 4.6) or PySide_ (>= 1.0.3) [#]_: for the Qt4-based backends.
-* PyQt5_ or PySide2_: for the Qt5-based backends.
-* PyGObject_: for the GTK3-based backends [#]_.
-* wxPython_ (>= 4) [#]_: for the wx-based backends.
-* pycairo_ (>= 1.11.0) or cairocffi_ (>= 0.8): for the GTK3 and/or cairo-based
-  backends.
-* Tornado_: for the WebAgg backend.
-
-.. _Tk: https://docs.python.org/3/library/tk.html
-.. _PyQt4: https://pypi.org/project/PyQt4
-.. _PySide: https://pypi.org/project/PySide
-.. _PyQt5: https://pypi.org/project/PyQt5
-.. _PySide2: https://pypi.org/project/PySide2
-.. _PyGObject: https://pygobject.readthedocs.io/en/latest/
-.. _wxPython: https://www.wxpython.org/
-.. _pycairo: https://pycairo.readthedocs.io/en/latest/
-.. _cairocffi: https://cairocffi.readthedocs.io/en/latest/
-.. _Tornado: https://pypi.org/project/tornado
-
-.. [#] PySide cannot be pip-installed on Linux (but can be conda-installed).
-.. [#] If using pip (and not conda), PyGObject must be built from source; see
-       https://pygobject.readthedocs.io/en/latest/devguide/dev_environ.html.
-.. [#] If using pip (and not conda) on Linux, wxPython wheels must be manually
-       downloaded from https://wxpython.org/pages/downloads/.
-
-For better support of animation output format and image file formats, LaTeX,
-etc., you can install the following:
-
-* `ffmpeg <https://www.ffmpeg.org/>`_: for saving movies.
-* `ImageMagick <https://www.imagemagick.org/script/index.php>`_: for saving
-  animated gifs.
-* `LaTeX <https://www.latex-project.org/>`_ (with `cm-super
-  <https://ctan.org/pkg/cm-super>`__ ) and `GhostScript (>=9.0)
-  <https://ghostscript.com/download/>`_ : for rendering text with
-  LaTeX.
-* `fontconfig <https://www.fontconfig.org>`_ (>= 2.7): for detection of system
-  fonts on Linux.
-
-FreeType and Qhull
-------------------
-
-Matplotlib depends on FreeType_ (>= 2.3), a font rendering library, and on
-Qhull_ (>= 2020.2), a library for computing triangulations.  By default,
-Matplotlib downloads and builds its own copies of FreeType (this is necessary
-to run the test suite, because different versions of FreeType rasterize
-characters differently) and of Qhull.  As an exception, Matplotlib defaults to
-the system version of FreeType on AIX.
-
-.. _FreeType: https://www.freetype.org/
-.. _Qhull: http://www.qhull.org/
-
-To force Matplotlib to use a copy of FreeType or Qhull already installed in
-your system, create a :file:`setup.cfg` file with the following contents:
-
-.. code-block:: cfg
-
-   [libs]
-   system_freetype = true
-   system_qhull = true
-
-before running ``python -m pip install .``.
-
-In this case, you need to install the FreeType and Qhull library and headers.
-This can be achieved using a package manager, e.g. for FreeType:
-
-.. code-block:: sh
-
-   # Pick ONE of the following:
-   sudo apt install libfreetype6-dev  # Debian/Ubuntu
-   sudo dnf install freetype-devel  # Fedora
-   brew install freetype  # macOS with Homebrew
-   conda install freetype  # conda, any OS
-
-(adapt accordingly for Qhull).
-
-On Linux and macOS, it is also recommended to install pkg-config_, a helper
-tool for locating FreeType:
-
-.. code-block:: sh
-
-   # Pick ONE of the following:
-   sudo apt install pkg-config  # Debian/Ubuntu
-   sudo dnf install pkgconf  # Fedora
-   brew install pkg-config  # macOS with Homebrew
-   conda install pkg-config  # conda
-   # Or point the PKG_CONFIG environment variable to the path to pkg-config:
-   export PKG_CONFIG=...
-
-.. _pkg-config: https://www.freedesktop.org/wiki/Software/pkg-config/
-
-If not using pkg-config (in particular on Windows), you may need to set the
-include path (to the library headers) and link path (to the libraries)
-explicitly, if they are not in standard locations.  This can be done using
-standard environment variables -- on Linux and OSX:
-
-.. code-block:: sh
-
-   export CFLAGS='-I/directory/containing/ft2build.h'
-   export LDFLAGS='-L/directory/containing/libfreetype.so'
-
-and on Windows:
-
-.. code-block:: bat
-
-   set CL=/IC:\directory\containing\ft2build.h
-   set LINK=/LIBPATH:C:\directory\containing\freetype.lib
-
-.. note::
-
-  Matplotlib always uses its own copies of the following libraries:
-
-  - ``Agg``: the Anti-Grain Geometry C++ rendering engine;
-  - ``ttconv``: a TrueType font utility.
-
-If you go this route but need to reset and rebuild to change your settings,
-remember to clear your artifacts before re-building::
-
-  git clean -xfd
-
 Building on Windows
 -------------------
 
@@ -286,9 +145,3 @@ Visual Studio 2015 or later.
 
 If you are building your own Matplotlib wheels (or sdists), note that any DLLs
 that you copy into the source tree will be packaged too.
-
-Conda packages
---------------
-
-The conda packaging scripts for Matplotlib are available at
-https://github.com/conda-forge/matplotlib-feedstock.
diff --git a/doc/_static/fonts/Carlogo-boldItalic.ttf → doc/_static/fonts/Carlogo-bolditalic.ttf b/doc/_static/fonts/Carlogo-boldItalic.ttf → doc/_static/fonts/Carlogo-bolditalic.ttf