matplotlib · ybrrraway · May 6, 2023 · May 31, 2023 · May 31, 2023 · May 31, 2023
diff --git a/.appveyor.yml b/.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
@@ -22,10 +28,10 @@ environment:
                  --cov-report= --cov=lib --log-level=DEBUG
 
   matrix:
-    - PYTHON_VERSION: "3.8"
+    - PYTHON_VERSION: "3.9"
       CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
-    - PYTHON_VERSION: "3.9"
+    - PYTHON_VERSION: "3.10"
       CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "no"
 

diff --git a/.circleci/config.yml b/.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 \
+                numpy<< parameters.numpy_version >> \
                 -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:
@@ -205,9 +205,9 @@ commands:
 #
 
 jobs:
-  docs-python38:
+  docs-python39:
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.9
     resource_class: large
     steps:
       - checkout
@@ -250,4 +250,4 @@ workflows:
     jobs:
       # NOTE: If you rename this job, then you must update the `if` condition
       # and `circleci-jobs` option in `.github/workflows/circleci.yml`.
-      - docs-python38
+      - docs-python39
diff --git a/.circleci/fetch_doc_logs.py b/.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')
 

diff --git a/.coveragerc b/.coveragerc
@@ -12,3 +12,5 @@ exclude_lines =
     def __str__
     def __repr__
     if __name__ == .__main__.:
+    if TYPE_CHECKING:
+    if typing.TYPE_CHECKING:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,32 @@
+
+{
+  "hostRequirements": {
+    "memory": "8gb",
+    "cpus": 4
+  },
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/desktop-lite:1": {},
+    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+      "packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-humor-sans,fonts-noto-cjk,optipng"
+    }
+  },
+  "onCreateCommand": ".devcontainer/setup.sh",
+  "postCreateCommand": "",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "yy0931.mplstyle",
+        "eamodio.gitlens",
+        "ms-vscode.live-server"
+      ],
+      "settings": {}
+    }
+},
+"portsAttributes": {
+	"6080": {
+		"label": "desktop"
+	}
+}
+}
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+curl micro.mamba.pm/install.sh | bash
+
+conda init --all
+micromamba shell init -s bash
+micromamba env create -f environment.yml --yes
+# Note that `micromamba activate mpl-dev` doesn't work, it must be run by the
+# user (same applies to `conda activate`)
+echo "envs_dirs:
+  - /home/codespace/micromamba/envs" > /opt/conda/.condarc
diff --git a/.flake8 b/.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
@@ -36,26 +27,23 @@ exclude =
     doc/tutorials
     # External files.
     tools/gh_api.py
-    tools/github_stats.py
     .tox
     .eggs
 
 per-file-ignores =
     setup.py: E402
-    tests.py: F401
 
     lib/matplotlib/__init__.py: E402, F401
+    lib/matplotlib/_animation_data.py: E501
     lib/matplotlib/_api/__init__.py: F401
     lib/matplotlib/_cm.py: E122, E202, E203, E302
     lib/matplotlib/_mathtext.py: E221, E251
     lib/matplotlib/_mathtext_data.py: E122, E203, E261
-    lib/matplotlib/_animation_data.py: E501
     lib/matplotlib/axes/__init__.py: F401, F403
     lib/matplotlib/backends/backend_template.py: F401
-    lib/matplotlib/backends/qt_editor/formlayout.py: F401, F403
     lib/matplotlib/font_manager.py: E501
     lib/matplotlib/image.py: F401, F403
-    lib/matplotlib/mathtext.py: E221, E251
+    lib/matplotlib/mathtext.py: E221
     lib/matplotlib/pylab.py: F401, F403
     lib/matplotlib/pyplot.py: F401, F811
     lib/matplotlib/tests/test_mathtext.py: E501
@@ -67,52 +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/colors/colormap-manipulation.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/customizing.py: E501
-    tutorials/introductory/images.py: E402, E501
-    tutorials/introductory/pyplot.py: E402, E501
-    tutorials/introductory/sample_plots.py: E501
-    tutorials/introductory/quick_start.py: E703
-    tutorials/introductory/animation_tutorial.py: 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/lines_bars_and_markers/marker_reference.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/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/user_interfaces/toolmanager_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
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -9,3 +9,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
 
 # chore: fix spelling errors
 686c9e5a413e31c46bb049407d5eca285bcab76d
+
+# chore: pyupgrade --py39-plus
+4d306402bb66d6d4c694d8e3e14b91054417070e
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,27 +1,21 @@
-## PR Summary
+## PR summary
 
-## PR Checklist
+## PR checklist
+<!-- Please mark any checkboxes that do not apply to this PR as [N/A].-->
 
-<!-- Please mark any checkboxes that do not apply to this PR as [N/A]. -->
-
-**Documentation and Tests**
-- [ ] Has pytest style unit tests (and `pytest` passes)
-- [ ] Documentation is sphinx and numpydoc compliant (the docs should [build](https://matplotlib.org/devel/documenting_mpl.html#building-the-docs) without error).
-- [ ] New plotting related features are documented with examples.
-
-**Release Notes**
-- [ ] New features are marked with a `.. versionadded::` directive in the docstring and documented in `doc/users/next_whats_new/`
-- [ ] API changes are marked with a `.. versionchanged::` directive in the docstring and documented in `doc/api/next_api_changes/`
-- [ ] Release notes conform with instructions in  `next_whats_new/README.rst` or `next_api_changes/README.rst`
+- [ ] "closes #0000" is in the body of the PR description to [link the related issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
+- [ ] new and changed code is [tested](https://matplotlib.org/devdocs/devel/testing.html)
+- [ ] *Plotting related* features are demonstrated in an [example](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-examples-and-tutorials)
+- [ ] *New Features* and *API Changes* are noted with a [directive and release note](https://matplotlib.org/devdocs/devel/coding_guide.html#new-features-and-api-changes)
+- [ ] Documentation complies with [general](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-rest-pages) and [docstring](https://matplotlib.org/devdocs/devel/documenting_mpl.html#writing-docstrings) guidelines
 
 <!--
 Thank you so much for your PR!  To help us review your contribution, please
 consider the following points:
 
 - A development guide is available at https://matplotlib.org/devdocs/devel/index.html.
 
-- Help with git and github is available at
-  https://matplotlib.org/devel/gitwash/development_workflow.html.
+- Help with git and github is available at https://matplotlib.org/devdocs/devel/development_workflow.html
 
 - Create a separate branch for your changes and open the PR from this branch. Please avoid working on `main`.
 
@@ -34,7 +28,7 @@ consider the following points:
   link to any relevant issues.
 
 - If you are contributing fixes to docstrings, please pay attention to
-  http://matplotlib.org/devel/documenting_mpl.html#formatting.  In particular,
+  https://matplotlib.org/stable/devel/documenting_mpl.html#formatting-conventions.  In particular,
   note the difference between using single backquotes, double backquotes, and
   asterisks in the markup.
 

diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -21,10 +21,12 @@ coverage:
         if_no_uploads: error
         if_not_found: success
         if_ci_failed: failure
-        paths: '!lib/.*/tests/.*'
+        paths:
+          - '!lib/.*/tests/.*'
       tests:
         target: auto
         if_no_uploads: error
         if_not_found: success
         if_ci_failed: failure
-        paths: 'lib/.*/tests/.*'
+        paths:
+          - 'lib/.*/tests/.*'