Merge branch 'main' into cf-compiler

Author: timhoffm

.appveyor.yml

@@ -1,7 +1,6 @@
 # With infos from
 # http://tjelvarolsson.com/blog/how-to-continuously-test-your-python-code-on-windows-using-appveyor/
 # https://packaging.python.org/en/latest/appveyor/
-# https://github.com/rmcgibbo/python-appveyor-conda-example
 ---
 
 # Backslashes in quotes need to be escaped: \ -> "\\"
@@ -18,7 +17,7 @@ skip_commits:
 
 clone_depth: 50
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 environment:
 
@@ -30,7 +29,6 @@ environment:
 
   matrix:
     - PYTHON_VERSION: "3.11"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
       TEST_ALL: "yes"
 
 # We always use a 64-bit machine, but can build x86 distributions
@@ -46,24 +44,21 @@ cache:
   - '%USERPROFILE%\.cache\matplotlib'
 
 init:
-  - echo %PYTHON_VERSION% %CONDA_INSTALL_LOCN%
+  - ps:
+      Invoke-Webrequest
+      -URI https://micro.mamba.pm/api/micromamba/win-64/latest
+      -OutFile C:\projects\micromamba.tar.bz2
+  - ps: C:\PROGRA~1\7-Zip\7z.exe x C:\projects\micromamba.tar.bz2 -aoa -oC:\projects\
+  - ps: C:\PROGRA~1\7-Zip\7z.exe x C:\projects\micromamba.tar -ttar -aoa -oC:\projects\
+  - 'set PATH=C:\projects\Library\bin;%PATH%'
+  - micromamba shell init --shell cmd.exe
+  - micromamba config set always_yes true
+  - micromamba config prepend channels conda-forge
+  - micromamba info
 
 install:
-  - set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
-  - conda config --set always_yes true
-  - conda config --set show_channel_urls yes
-  - conda config --prepend channels conda-forge
-
-  # For building, use a new environment
-  # Add python version to environment
-  # `^ ` escapes spaces for indentation
-  - echo ^ ^ - python=%PYTHON_VERSION% >> environment.yml
-  - conda env create -f environment.yml
-  - activate mpl-dev
-  - conda install -c conda-forge pywin32
-  - echo %PYTHON_VERSION% %TARGET_ARCH%
-  # Show the installed packages + versions
-  - conda list
+  - micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
+  - micromamba activate mpl-dev
 
 test_script:
   # Now build the thing..
@@ -74,7 +69,7 @@ test_script:
   - '"%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
+  - if x%TEST_ALL% == xyes micromamba install -q ffmpeg inkscape
   # miktex is available on conda, but seems to fail with permission errors.
   # missing packages on conda-forge for imagemagick
   # This install sometimes failed randomly :-(
@@ -95,8 +90,8 @@ artifacts:
     type: Zip
 
 on_finish:
-  - conda install codecov
-  - codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
+  - micromamba install codecov
+  - codecov -e PYTHON_VERSION PLATFORM -n "%PYTHON_VERSION% Windows"
 
 on_failure:
   # Generate a html for visual tests

.circleci/config.yml

@@ -147,7 +147,7 @@ commands:
               export RELEASE_TAG='-t release'
             fi
             mkdir -p logs
-            make html O="-T $RELEASE_TAG -j1 -w /tmp/sphinxerrorswarnings.log"
+            make html O="-T $RELEASE_TAG -j4 -w /tmp/sphinxerrorswarnings.log"
             rm -r build/html/_sources
           working_directory: doc
       - save_cache:
@@ -216,9 +216,9 @@ commands:
 #
 
 jobs:
-  docs-python39:
+  docs-python3:
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:3.12
     resource_class: large
     steps:
       - checkout
@@ -259,4 +259,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-python39
+      - docs-python3

.flake8

@@ -34,17 +34,18 @@ exclude =
 
 per-file-ignores =
     lib/matplotlib/_cm.py: E202, E203, E302
-    lib/matplotlib/_mathtext.py: E221, E251
-    lib/matplotlib/_mathtext_data.py: E203, E261
+    lib/matplotlib/_mathtext.py: E221
+    lib/matplotlib/_mathtext_data.py: E203
     lib/matplotlib/backends/backend_template.py: F401
     lib/matplotlib/mathtext.py: E221
     lib/matplotlib/pylab.py: F401, F403
     lib/matplotlib/pyplot.py: F811
     lib/matplotlib/tests/test_mathtext.py: E501
-    lib/matplotlib/transforms.py: E201, E202, E203
+    lib/matplotlib/transforms.py: E201, E202
     lib/matplotlib/tri/_triinterpolate.py: E201, E221
     lib/mpl_toolkits/axes_grid1/axes_size.py: E272
     lib/mpl_toolkits/axisartist/angle_helper.py: E221
+    lib/mpl_toolkits/mplot3d/proj3d.py: E201
 
     doc/conf.py: E402
     galleries/users_explain/quick_start.py: E402

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -15,7 +15,9 @@ body:
     attributes:
       label: Code for reproduction
       description: >-
-        If possible, please provide a minimum self-contained example.
+        If possible, please provide a minimum self-contained example.  If you
+        have used generative AI as an aid see
+        https://matplotlib.org/devdocs/devel/contribute.html#restrictions-on-generative-ai-usage
       placeholder: Paste your code here. This field is automatically formatted as Python code.
       render: Python
     validations:

.github/ISSUE_TEMPLATE/tag_proposal.yml

@@ -2,7 +2,7 @@
 name: Tag Proposal
 description: Suggest a new tag or subcategory for the gallery of examples
 title: "[Tag]: "
-labels: [Tag proposal]
+labels: ["Documentation: tags"]
 body:
   - type: markdown
     attributes:

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,13 +4,20 @@ out the development guide https://matplotlib.org/devdocs/devel/index.html
 -->
 
 ## PR summary
-<!-- Please provide at least 1-2 sentences describing the pull request in detail
-(Why is this change required?  What problem does it solve?) and link to relevant
-issues and PRs.
+<!-- Please describe the pull request, using the questions below as guidance, and link to any relevant issues and PRs:
 
-Also please summarize the changes in the title, for example "Raise ValueError on
+- Why is this change necessary?
+- What problem does it solve?
+- What is the reasoning for this implementation?
+
+Additionally, please summarize the changes in the title, for example "Raise ValueError on
 non-numeric input to set_xlim" and avoid non-descriptive titles such as "Addresses
 issue #8576".
+
+If possible, please provide a minimum self-contained example.  If you have used
+generative AI as an aid in preparing this PR, see
+
+https://matplotlib.org/devdocs/devel/contribute.html#restrictions-on-generative-ai-usage
 -->
 
 

.github/labeler.yml

@@ -89,6 +89,7 @@
           - 'doc/conf.py'
           - 'doc/Makefile'
           - 'doc/make.bat'
+          - 'doc/sphinxext/**'
 "Documentation: devdocs":
   - changed-files:
       - any-glob-to-any-file:

.github/workflows/cibuildwheel.yml

@@ -34,19 +34,20 @@ jobs:
                  'CI: Run cibuildwheel')
       )
     name: Build sdist
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           fetch-depth: 0
+          persist-credentials: false
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
         name: Install Python
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       # Something changed somewhere that prevents the downloaded-at-build-time
       # licenses from being included in built wheels, so pre-download them so
@@ -69,7 +70,7 @@ jobs:
         run: twine check dist/*
 
       - name: Upload sdist result
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  # v4.6.0
         with:
           name: cibw-sdist
           path: dist/*.tar.gz
@@ -100,82 +101,87 @@ jobs:
       CIBW_AFTER_BUILD: >-
         twine check {wheel} &&
         python {package}/ci/check_wheel_licenses.py {wheel}
-      CIBW_CONFIG_SETTINGS: setup-args="--vsenv"
+      # On Windows, we explicitly request MSVC compilers (as GitHub Action runners have
+      # MinGW on PATH that would be picked otherwise), switch to a static build for
+      # runtimes, but use dynamic linking for `VCRUNTIME140.dll`, `VCRUNTIME140_1.dll`,
+      # and the UCRT. This avoids requiring specific versions of `MSVCP140.dll`, while
+      # keeping shared state with the rest of the Python process/extensions.
+      CIBW_CONFIG_SETTINGS_WINDOWS: >-
+        setup-args="--vsenv"
+        setup-args="-Db_vscrt=mt"
+        setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
       CIBW_SKIP: "*-musllinux_aarch64"
       CIBW_TEST_COMMAND: >-
         python {package}/ci/check_version_number.py
       MACOSX_DEPLOYMENT_TARGET: "10.12"
-      MPL_DISABLE_FH4: "yes"
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cibw_archs: "x86_64"
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04-arm
             cibw_archs: "aarch64"
           - os: windows-latest
             cibw_archs: "auto64"
-          - os: macos-12
+          - os: macos-13
             cibw_archs: "x86_64"
           - os: macos-14
             cibw_archs: "arm64"
 
     steps:
-      - name: Set up QEMU
-        if: matrix.cibw_archs == 'aarch64'
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Download sdist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16  # v4.1.8
         with:
           name: cibw-sdist
           path: dist/
 
+      - name: Build wheels for CPython 3.13
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969  # v2.22.0
+        with:
+          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
+        env:
+          CIBW_BUILD: "cp313-* cp313t-*"
+          CIBW_ENABLE: cpython-freethreading
+          # No free-threading wheels available for aarch64 on Pillow.
+          CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+
       - name: Build wheels for CPython 3.12
-        uses: pypa/cibuildwheel@ba8be0d98853f5744f24e7f902c8adef7ae2e7f3  # v2.18.1
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969  # v2.22.0
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.11
-        uses: pypa/cibuildwheel@ba8be0d98853f5744f24e7f902c8adef7ae2e7f3  # v2.18.1
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969  # v2.22.0
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.10
-        uses: pypa/cibuildwheel@ba8be0d98853f5744f24e7f902c8adef7ae2e7f3  # v2.18.1
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969  # v2.22.0
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-      - name: Build wheels for CPython 3.9
-        uses: pypa/cibuildwheel@ba8be0d98853f5744f24e7f902c8adef7ae2e7f3  # v2.18.1
-        with:
-          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
-        env:
-          CIBW_BUILD: "cp39-*"
-          CIBW_ARCHS: ${{ matrix.cibw_archs }}
-
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@ba8be0d98853f5744f24e7f902c8adef7ae2e7f3  # v2.18.1
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969  # v2.22.0
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
-          CIBW_BUILD: "pp39-*"
+          CIBW_BUILD: "pp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-        if: matrix.cibw_archs != 'aarch64'
+          CIBW_ENABLE: pypy
+        if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08  # v4.6.0
         with:
           name: cibw-wheels-${{ runner.os }}-${{ matrix.cibw_archs }}
           path: ./wheelhouse/*.whl
@@ -193,7 +199,7 @@ jobs:
       contents: read
     steps:
       - name: Download packages
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16  # v4.1.8
         with:
           pattern: cibw-*
           path: dist
@@ -203,9 +209,9 @@ jobs:
         run: ls dist
 
       - name: Generate artifact attestation for sdist and wheel
-        uses: actions/attest-build-provenance@49df96e17e918a15956db358890b08e61c704919  # v1.2.0
+        uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4  # v2.2.0
         with:
           subject-path: dist/matplotlib-*
 
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450  # v1.8.14
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  # v1.12.4