Merge branch 'main' into ttconv_pybind11_pr

Author: oscargus

.appveyor.yml

@@ -9,6 +9,12 @@ branches:
     - /auto-backport-.*/
     - /^v\d+\.\d+\.[\dx]+-doc$/
 
+skip_commits:
+  message: /\[ci doc\]/
+  files:
+    - doc/
+    - galleries/
+
 clone_depth: 50
 
 image: Visual Studio 2017

.circleci/config.yml

@@ -97,11 +97,11 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
-            python -m pip install --no-deps --user \
-                git+https://github.com/matplotlib/mpl-sphinx-theme.git
             python -m pip install --user \
                 numpy<< parameters.numpy_version >> codecov coverage \
                 -r requirements/doc/doc-requirements.txt
+            python -m pip install --no-deps --user \
+                git+https://github.com/matplotlib/mpl-sphinx-theme.git
 
   mpl-install:
     steps:

.circleci/fetch_doc_logs.py

@@ -22,7 +22,7 @@
 from pathlib import Path
 import sys
 from urllib.parse import urlparse
-from urllib.request import urlopen
+from urllib.request import URLError, urlopen
 
 
 if len(sys.argv) != 2:
@@ -38,8 +38,11 @@
     f'{organization}/{repository}/{build_id}/artifacts'
 )
 print(artifact_url)
-with urlopen(artifact_url) as response:
-    artifacts = json.load(response)
+try:
+    with urlopen(artifact_url) as response:
+        artifacts = json.load(response)
+except URLError:
+    artifacts = {'items': []}
 artifact_count = len(artifacts['items'])
 print(f'Found {artifact_count} artifacts')
 

.flake8

@@ -2,32 +2,23 @@
 max-line-length = 88
 select =
     # flake8 default
-    C90, E, F, W,
-    # docstring-convention=numpy
-    D100, D101, D102, D103, D104, D105, D106,
-    D200, D201, D202, D204, D205, D206, D207, D208,
-    D209, D210, D211, D214, D215,
-    D300, D301, D302,
-    D400, D401, D403, D404, D405, D406, D407, D408,
-    D409, D410, D411, D412, D414,
-    # matplotlib-specific extra pydocstyle errors
-    D213,
+    D, E, F, W,
 ignore =
     # flake8 default
     E121,E123,E126,E226,E24,E704,W503,W504,
     # Additional ignores:
     E127, E131,
     E266,
     E305, E306,
-    E722, E741,
+    E741,
     F841,
-    # Some new flake8 ignores:
-    N801, N802, N803, N806, N812,
     # pydocstyle
-    D100, D101, D102, D103, D104, D105, D106, D107,
-    D200, D202, D203, D204, D205, D207, D212,
+    D100, D101, D102, D103, D104, D105, D106,
+    D200, D202, D204, D205,
     D301,
-    D400, D401, D402, D403, D404, D413,
+    D400, D401, D403, D404
+    # ignored by pydocstyle numpy docstring convention
+    D107, D203, D212, D213, D402, D413, D415, D416, D417,
 
 exclude =
     .git
@@ -42,7 +33,6 @@ exclude =
 per-file-ignores =
     setup.py: E402
 
-
     lib/matplotlib/__init__.py: E402, F401
     lib/matplotlib/_animation_data.py: E501
     lib/matplotlib/_api/__init__.py: F401
@@ -65,47 +55,43 @@ per-file-ignores =
     lib/pylab.py: F401, F403
 
     doc/conf.py: E402
-    tutorials/advanced/path_tutorial.py: E402
-    tutorials/advanced/patheffects_guide.py: E402
-    tutorials/advanced/transforms_tutorial.py: E402, E501
-    tutorials/colors/colormaps.py: E501
-    tutorials/colors/colors.py: E402
-    tutorials/intermediate/artists.py: E402
-    tutorials/intermediate/constrainedlayout_guide.py: E402
-    tutorials/intermediate/legend_guide.py: E402
-    tutorials/intermediate/tight_layout_guide.py: E402
-    tutorials/introductory/animation_tutorial.py: E501
-    tutorials/introductory/images.py: E501
-    tutorials/introductory/pyplot.py: E402, E501
-    tutorials/text/annotations.py: E402, E501
-    tutorials/text/mathtext.py: E501
-    tutorials/text/text_intro.py: E402
-    tutorials/text/text_props.py: E501
-    tutorials/text/usetex.py: E501
-    tutorials/toolkits/axes_grid.py: E501
-    tutorials/toolkits/axisartist.py: E501
+    galleries/users_explain/artists/paths.py: E402
+    galleries/users_explain/artists/patheffects_guide.py: E402
+    galleries/users_explain/artists/transforms_tutorial.py: E402, E501
+    galleries/users_explain/colors/colormaps.py: E501
+    galleries/users_explain/colors/colors.py: E402
+    galleries/tutorials/artists.py: E402
+    galleries/users_explain/axes/constrainedlayout_guide.py: E402
+    galleries/users_explain/axes/legend_guide.py: E402
+    galleries/users_explain/axes/tight_layout_guide.py: E402
+    galleries/users_explain/animations/animations.py: E501
+    galleries/tutorials/images.py: E501
+    galleries/tutorials/pyplot.py: E402, E501
+    galleries/users_explain/text/annotations.py: E402, E501
+    galleries/users_explain/text/mathtext.py: E501
+    galleries/users_explain/text/text_intro.py: E402
+    galleries/users_explain/text/text_props.py: E501
 
-    examples/animation/frame_grabbing_sgskip.py: E402
-    examples/images_contours_and_fields/tricontour_demo.py: E201
-    examples/images_contours_and_fields/tripcolor_demo.py: E201
-    examples/images_contours_and_fields/triplot_demo.py: E201
-    examples/lines_bars_and_markers/marker_reference.py: E402
-    examples/misc/print_stdout_sgskip.py: E402
-    examples/misc/table_demo.py: E201
-    examples/style_sheets/bmh.py: E501
-    examples/style_sheets/plot_solarizedlight2.py: E501
-    examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
-    examples/text_labels_and_annotations/custom_legends.py: E402
-    examples/ticks/date_concise_formatter.py: E402
-    examples/ticks/date_formatters_locators.py: F401
-    examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
-    examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
-    examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
-    examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
-    examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
-    examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
-    examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
-    examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
-    examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
-    examples/userdemo/pgf_preamble_sgskip.py: E402
+    galleries/examples/animation/frame_grabbing_sgskip.py: E402
+    galleries/examples/images_contours_and_fields/tricontour_demo.py: E201
+    galleries/examples/images_contours_and_fields/tripcolor_demo.py: E201
+    galleries/examples/images_contours_and_fields/triplot_demo.py: E201
+    galleries/examples/lines_bars_and_markers/marker_reference.py: E402
+    galleries/examples/misc/print_stdout_sgskip.py: E402
+    galleries/examples/misc/table_demo.py: E201
+    galleries/examples/style_sheets/bmh.py: E501
+    galleries/examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
+    galleries/examples/text_labels_and_annotations/custom_legends.py: E402
+    galleries/examples/ticks/date_concise_formatter.py: E402
+    galleries/examples/ticks/date_formatters_locators.py: F401
+    galleries/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
+    galleries/examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
+    galleries/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
+    galleries/examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
+    galleries/examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
+    galleries/examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
+    galleries/examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
+    galleries/examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
+    galleries/examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
+    galleries/examples/userdemo/pgf_preamble_sgskip.py: E402
 force-check = True

.github/workflows/cibuildwheel.yml

@@ -35,20 +35,29 @@ jobs:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
-      CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
-      MACOSX_DEPLOYMENT_TARGET: "10.12"
+      CIBW_BEFORE_BUILD: >-
+        pip install certifi oldest-supported-numpy &&
+        git clean -fxd build
       CIBW_BEFORE_BUILD_WINDOWS: >-
         pip install certifi delvewheel oldest-supported-numpy &&
         git clean -fxd build
       CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
         delvewheel repair -w {dest_dir} {wheel}
+      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+      CIBW_SKIP: "*-musllinux*"
+      MACOSX_DEPLOYMENT_TARGET: "10.12"
+      MPL_DISABLE_FH4: "yes"
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-11]
-        cibw_archs: ["auto"]
         include:
+          - os: ubuntu-20.04
+            cibw_archs: "x86_64"
           - os: ubuntu-20.04
             cibw_archs: "aarch64"
+          - os: windows-latest
+            cibw_archs: "auto"
+          - os: macos-11
+            cibw_archs: "x86_64 universal2 arm64"
 
     steps:
       - name: Set up QEMU
@@ -61,53 +70,36 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Something changed somewhere that prevents the downloaded-at-build-time
+      # licenses from being included in built wheels, so pre-download them so
+      # that they exist before the build and are included.
+      - name: Pre-download bundled licenses
+        run: >
+          curl -Lo LICENSE/LICENSE_QHULL
+          https://github.com/qhull/qhull/raw/2020.2/COPYING.txt
+
       - name: Build wheels for CPython 3.11
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
         env:
           CIBW_BUILD: "cp311-*"
-          CIBW_SKIP: "*-musllinux*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: >-
-            pip install certifi oldest-supported-numpy &&
-            git clean -fxd build
-          MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.10
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
         env:
           CIBW_BUILD: "cp310-*"
-          CIBW_SKIP: "*-musllinux*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: >-
-            pip install certifi oldest-supported-numpy &&
-            git clean -fxd build
-          MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.9
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
         env:
           CIBW_BUILD: "cp39-*"
-          CIBW_SKIP: "*-musllinux*"
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-          CIBW_BEFORE_BUILD: >-
-            pip install certifi oldest-supported-numpy &&
-            git clean -fxd build
-          MPL_DISABLE_FH4: "yes"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for PyPy
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
         env:
           CIBW_BUILD: "pp39-*"
-          CIBW_SKIP: "*-musllinux*"
-          CIBW_BEFORE_BUILD: >-
-            pip install certifi oldest-supported-numpy &&
-            git clean -fxd build
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
         if: matrix.cibw_archs != 'aarch64'
 

.github/workflows/stale.yml

@@ -0,0 +1,25 @@
+name: 'Label inactive PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    if: github.repository == 'matplotlib/matplotlib'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          operations-per-run: 150
+          stale-pr-message: 'Since this Pull Request has not been updated in 60 days, it has been marked "inactive." This does not mean that it will be closed, though it may be moved to a "Draft" state.  This helps maintainers prioritize their reviewing efforts. You can pick the PR back up anytime - please ping us if you need a review or guidance to move the PR forward!  If you do not plan on continuing the work, please let us know so that we can either find someone to take the PR over, or close it.'
+          stale-pr-label: 'inactive'
+          days-before-pr-stale: 60
+          days-before-pr-close: -1
+          stale-issue-message: 'This issue has been marked "inactive" because it has been 365 days since the last comment. If this issue is still present in recent Matplotlib releases, or the feature request is still wanted, please leave a comment and this label will be removed. If there are no updates in another 30 days, this issue will be automatically closed, but you are free to re-open or create a new issue if needed. We value issue reports, and this procedure is meant to help us resurface and prioritize issues that have not been addressed yet, not make them disappear.  Thanks for your help!'
+          stale-issue-label: 'inactive'
+          days-before-issue-stale: 365
+          days-before-issue-close: 30
+          ascending: true
+          exempt-issue-labels: "keep"
+          exempt-pr-labels: "keep,status: orphaned PR"

.github/workflows/tests.yml

@@ -12,6 +12,12 @@ on:
   pull_request:
     branches-ignore:
       - v[0-9]+.[0-9]+.[0-9x]+-doc
+    paths-ignore:
+      # Skip running tests if changes are only in documentation directories
+      - 'doc/**'
+      - 'galleries/examples/**'
+      - 'galleries/plot_types/**'
+      - 'galleries/tutorials/**'
   schedule:
     # 5:47 UTC on Saturdays
     - cron: "47 5 * * 6"
@@ -230,9 +236,14 @@ jobs:
 
       - name: Install the nightly dependencies
         # Only install the nightly dependencies during the scheduled event
-        if: ${{ github.event_name == 'schedule' && matrix.name-suffix != '(Minimum Versions)' }}
+        if: |
+          github.event_name == 'schedule' &&
+          matrix.name-suffix != '(Minimum Versions)'
         run: |
-          python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple --upgrade --only-binary=:all: numpy pandas
+          python -m pip install pytz  # Must be installed for Pandas.
+          python -m pip install \
+            --index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple \
+            --upgrade --only-binary=:all: numpy pandas
 
       - name: Install Matplotlib
         run: |

.gitignore

@@ -56,8 +56,8 @@ Thumbs.db
 
 # Things specific to this project #
 ###################################
-tutorials/intermediate/CL01.png
-tutorials/intermediate/CL02.png
+galleries/tutorials/intermediate/CL01.png
+galleries/tutorials/intermediate/CL02.png
 
 # Documentation generated files #
 #################################
@@ -71,15 +71,14 @@ doc/modules
 doc/plot_types
 doc/pyplots/tex_demo.png
 doc/tutorials
+doc/users/explain
 lib/dateutil
-examples/*/*.bmp
-examples/*/*.eps
-examples/*/*.pdf
-examples/*/*.png
-examples/*/*.svg
-examples/*/*.svgz
-examples/tests/*
-!examples/tests/backend_driver_sgskip.py
+galleries/examples/*/*.bmp
+galleries/examples/*/*.eps
+galleries/examples/*/*.pdf
+galleries/examples/*/*.png
+galleries/examples/*/*.svg
+galleries/examples/*/*.svgz
 result_images
 doc/_static/constrained_layout*.png
 doc/.mpl_skip_subdirs.yaml

.lgtm.yml

@@ -47,4 +47,4 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
-        files: ^tutorials/|^examples/
+        files: ^galleries/tutorials/|^galleries/examples/|^galleries/plot_types/