[pull] master from matplotlib:master

.appveyor.yml

@@ -60,6 +60,8 @@ install:
   # pull pywin32 from conda because on py38 there is something wrong with finding
   # the dlls when insalled from pip
   - conda install -c conda-forge pywin32
+  # install pyqt from conda-forge
+  - conda install -c conda-forge pyqt
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # Install dependencies from PyPI.
   - python -m pip install --upgrade -r requirements/testing/all.txt %EXTRAREQS% %PINNEDVERS%

.circleci/config.yml

@@ -124,15 +124,13 @@ commands:
           command: |
             # Set epoch to date of latest tag.
             export SOURCE_DATE_EPOCH="$(git log -1 --format=%at $(git describe --abbrev=0))"
-            # Include analytics only when deploying to devdocs.
-            if [ "$CIRCLE_PROJECT_USERNAME" != "matplotlib" ] || \
-               [ "$CIRCLE_BRANCH" != "master" ] || \
-               [[ "$CIRCLE_PULL_REQUEST" == https://github.com/matplotlib/matplotlib/pull/* ]]; then
-              export ANALYTICS=False
-            else
-              export ANALYTICS=True
+            # Set release mode only when deploying to devdocs.
+            if [ "$CIRCLE_PROJECT_USERNAME" = "matplotlib" ] && \
+               [ "$CIRCLE_BRANCH" = "master" ] && \
+               [ "$CIRCLE_PR_NUMBER" = "" ]; then
+              export RELEASE_TAG='-t release'
             fi
-            make html O="-T -Ainclude_analytics=$ANALYTICS"
+            make html O="-T $RELEASE_TAG"
             rm -r build/html/_sources
           working_directory: doc
       - save_cache:

.flake8

@@ -85,7 +85,7 @@ per-file-ignores =
     lib/mpl_toolkits/tests/conftest.py: F401
     lib/pylab.py: F401, F403
 
-    doc/conf.py: E402, E501
+    doc/conf.py: E402
     tutorials/advanced/path_tutorial.py: E402
     tutorials/advanced/patheffects_guide.py: E402
     tutorials/advanced/transforms_tutorial.py: E402, E501

.github/workflows/cibuildwheel.yml

@@ -18,7 +18,7 @@ jobs:
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-18.04, windows-latest, macos-10.15]
         cibw_archs: ["auto"]
         include:
           - os: ubuntu-18.04
@@ -64,7 +64,7 @@ jobs:
       - name: Build wheels for CPython 3.10
         run: |
           python -m cibuildwheel --output-dir dist
-        if: matrix.os != 'macos-latest'
+        if: matrix.os != 'macos-10.15'
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
@@ -102,6 +102,7 @@ jobs:
           CIBW_BUILD: "pp37-*"
           CIBW_BEFORE_BUILD: pip install certifi numpy==${{ env.min-numpy-version }}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
+          PIP_USE_FEATURE: in-tree-build
         if: matrix.cibw_archs != 'aarch64'
 
       - name: Validate that LICENSE files are included in wheels

.github/workflows/clean_pr.yml

@@ -0,0 +1,22 @@
+name: PR cleanliness
+on: [pull_request]
+
+jobs:
+  pr_clean:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Check for added-and-deleted files
+        run: |
+          git fetch --quiet origin "$GITHUB_BASE_REF"
+          base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
+          ad="$(git log "$base..HEAD^2" --pretty=tformat: --name-status --diff-filter=AD |
+                cut --fields 2 | sort | uniq --repeated)"
+          if [[ -n "$ad" ]]; then
+            printf 'The following files were both added and deleted in this PR:\n%s\n' "$ad"
+            exit 1
+          fi
+

LICENSE/LICENSE_COURIERTEN

@@ -0,0 +1,18 @@
+The Courier10PitchBT-Bold.pfb file is a Type-1 version of
+Courier 10 Pitch BT Bold by Bitstream, obtained from
+<https://ctan.org/tex-archive/fonts/courierten>. It is included
+here as test data only, but the following license applies.
+
+
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+You are hereby granted permission under all Bitstream propriety rights
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+for any purpose and without restriction; provided, that this notice is
+left intact on all copies of such fonts and that Bitstream's trademark
+is acknowledged as shown below on all unmodified copies of the 4 Charter
+Type 1 fonts.
+
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+

README.rst

@@ -42,53 +42,52 @@
 
 .. image:: https://matplotlib.org/_static/logo2.svg
 
-Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.
+Matplotlib is a comprehensive library for creating static, animated, and
+interactive visualizations in Python.
 
 Check out our `home page <https://matplotlib.org/>`_ for more information.
 
 .. image:: https://matplotlib.org/_static/readme_preview.png
 
-Matplotlib produces publication-quality figures in a variety of hardcopy formats
-and interactive environments across platforms. Matplotlib can be used in Python scripts,
-the Python and IPython shell, web application servers, and various
-graphical user interface toolkits.
+Matplotlib produces publication-quality figures in a variety of hardcopy
+formats and interactive environments across platforms. Matplotlib can be used
+in Python scripts, the Python and IPython shell, web application servers, and
+various graphical user interface toolkits.
 
 
 Install
 =======
 
 For installation instructions and requirements, see `INSTALL.rst <INSTALL.rst>`_  or the
-`install <https://matplotlib.org/users/installing.html>`_ documentation.
-
-Test
-====
-
-After installation, launch the test suite::
-
-  python -m pytest
-
-Read the `testing guide <https://matplotlib.org/devel/testing.html>`_ for more information and alternatives.
+`install <https://matplotlib.org/stable/users/installing.html>`_ documentation.
 
 Contribute
 ==========
+
 You've discovered a bug or something else you want to change - excellent!
 
 You've worked out a way to fix it – even better!
 
 You want to tell us about it – best of all!
 
-Start at the `contributing guide <https://matplotlib.org/devdocs/devel/contributing.html>`_!
+Start at the `contributing guide
+<https://matplotlib.org/devdocs/devel/contributing.html>`_!
 
 Contact
 =======
 
-`Discourse <https://discourse.matplotlib.org/>`_ is the discussion forum for general questions and discussions and our recommended starting point.
+`Discourse <https://discourse.matplotlib.org/>`_ is the discussion forum for
+general questions and discussions and our recommended starting point.
 
 Our active mailing lists (which are mirrored on Discourse) are:
 
-* `Users <https://mail.python.org/mailman/listinfo/matplotlib-users>`_ mailing list: matplotlib-users@python.org
-* `Announcement  <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing list: matplotlib-announce@python.org
-* `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_ mailing list: matplotlib-devel@python.org
+* `Users <https://mail.python.org/mailman/listinfo/matplotlib-users>`_ mailing
+  list: matplotlib-users@python.org
+* `Announcement
+  <https://mail.python.org/mailman/listinfo/matplotlib-announce>`_ mailing
+  list: matplotlib-announce@python.org
+* `Development <https://mail.python.org/mailman/listinfo/matplotlib-devel>`_
+  mailing list: matplotlib-devel@python.org
 
 Gitter_ is for coordinating development and asking questions directly related
 to contributing to matplotlib.
@@ -99,21 +98,21 @@ Citing Matplotlib
 If Matplotlib contributes to a project that leads to publication, please
 acknowledge this by citing Matplotlib.
 
-`A ready-made citation entry <https://matplotlib.org/citing.html>`_ is available.
+`A ready-made citation entry <https://matplotlib.org/stable/citing.html>`_ is
+available.
 
 Research notice
 ~~~~~~~~~~~~~~~
 
 Please note that this repository is participating in a study into
 sustainability of open source projects. Data will be gathered about this
-repository for approximately the next 12 months, starting from June
-2021.
+repository for approximately the next 12 months, starting from June 2021.
 
-Data collected will include number of contributors, number of PRs, time
-taken to close/merge these PRs, and issues closed.
+Data collected will include number of contributors, number of PRs, time taken
+to close/merge these PRs, and issues closed.
 
-For more information, please visit `the informational
-page <https://sustainable-open-science-and-software.github.io/>`__ or
-download the `participant information
-sheet <https://sustainable-open-science-and-software.github.io/assets/PIS_sustainable_software.pdf>`__.
+For more information, please visit `the informational page
+<https://sustainable-open-science-and-software.github.io/>`__ or download the
+`participant information sheet
+<https://sustainable-open-science-and-software.github.io/assets/PIS_sustainable_software.pdf>`__.
 

doc/_static/mpl.css

@@ -231,3 +231,17 @@ table.property-table td {
     /* fix width to width of cheatsheet */
     width: 210px;
 }
+
+/* Two columns for install code blocks */
+div.twocol {
+    padding-left: 0;
+    padding-right: 0;
+    display: flex;
+    gap: 20px;
+}
+
+div.twocol > div {
+    flex-grow: 1;
+    padding: 0;
+    margin: 0;
+}