Merge branch 'main' into output-base-name

Author: asmeurer

.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:
+      # Pinned due to https://github.com/mamba-org/mamba/issues/3467
+      Invoke-Webrequest
+      -URI https://github.com/mamba-org/micromamba-releases/releases/download/1.5.10-0/micromamba-win-64.tar.bz2
+      -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
 
 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,7 +90,7 @@ artifacts:
     type: Zip
 
 on_finish:
-  - conda install codecov
+  - micromamba install codecov
   - codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
 
 on_failure:

.circleci/config.yml

@@ -98,12 +98,12 @@ commands:
     parameters:
       numpy_version:
         type: string
-        default: ""
+        default: "~=2.0.0"
     steps:
       - run:
           name: Install Python dependencies
           command: |
-            python -m pip install --user meson-python numpy pybind11 setuptools-scm
+            python -m pip install --user -r requirements/dev/build-requirements.txt
             python -m pip install --user \
                 numpy<< parameters.numpy_version >> \
                 -r requirements/doc/doc-requirements.txt
@@ -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/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/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

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/setup-python@v5
         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
@@ -100,11 +100,20 @@ 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:
@@ -115,16 +124,10 @@ jobs:
             cibw_archs: "aarch64"
           - os: windows-latest
             cibw_archs: "auto64"
-          - os: macos-11
+          - os: macos-12
             cibw_archs: "x86_64"
-            # NOTE: macos_target can be moved back into global environment after
-            # meson-python 0.16.0 is released.
-            macos_target: "10.12"
           - os: macos-14
             cibw_archs: "arm64"
-            # NOTE: macos_target can be moved back into global environment after
-            # meson-python 0.16.0 is released.
-            macos_target: "11.0"
 
     steps:
       - name: Set up QEMU
@@ -139,51 +142,66 @@ jobs:
           name: cibw-sdist
           path: dist/
 
+      - name: Build wheels for CPython 3.13
+        uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4  # v2.21.2
+        with:
+          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
+        env:
+          CIBW_BUILD: "cp313-* cp313t-*"
+          # No free-threading wheels for NumPy; musllinux skipped for main builds also.
+          CIBW_SKIP: "cp313t-win_amd64 *-musllinux_aarch64"
+          CIBW_BUILD_FRONTEND:
+            "pip; args: --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+          CIBW_FREE_THREADED_SUPPORT: true
+          # No free-threading wheels available for aarch64 on Pillow.
+          CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
+          # We need pre-releases to get the nightly wheels.
+          CIBW_BEFORE_TEST: >-
+            pip install --pre
+            --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+            contourpy numpy pillow
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+
       - name: Build wheels for CPython 3.12
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
+        uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4  # v2.21.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for CPython 3.11
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
+        uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4  # v2.21.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for CPython 3.10
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
+        uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4  # v2.21.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
-
-      - name: Build wheels for CPython 3.9
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
-        with:
-          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
-        env:
-          CIBW_BUILD: "cp39-*"
-          CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
 
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce  # v2.17.0
+        uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4  # v2.21.2
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
-          CIBW_BUILD: "pp39-*"
+          CIBW_BUILD: "pp310-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          MACOSX_DEPLOYMENT_TARGET: "${{ matrix.macos_target }}"
-        if: matrix.cibw_archs != 'aarch64'
+          # Work around for https://github.com/pypa/setuptools/issues/4571
+          # This can be removed once kiwisolver has wheels for PyPy 3.10
+          # https://github.com/nucleic/kiwi/pull/182
+          CIBW_BEFORE_TEST: >-
+            export PIP_CONSTRAINT=pypy-constraint.txt &&
+            echo "setuptools!=72.2.0" > $PIP_CONSTRAINT &&
+            pip install kiwisolver &&
+            unset PIP_CONSTRAINT
+        if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
 
       - uses: actions/upload-artifact@v4
         with:
@@ -199,6 +217,8 @@ jobs:
     environment: release
     permissions:
       id-token: write
+      attestations: write
+      contents: read
     steps:
       - name: Download packages
         uses: actions/download-artifact@v4
@@ -210,5 +230,10 @@ jobs:
       - name: Print out packages
         run: ls dist
 
+      - name: Generate artifact attestation for sdist and wheel
+        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c  # v1.4.3
+        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@f7600683efdcb7656dec5b29656edb7bc586e597  # v1.10.3

.github/workflows/circleci.yml

@@ -3,23 +3,24 @@ name: "CircleCI artifact handling"
 on: [status]
 jobs:
   circleci_artifacts_redirector_job:
-    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python3' }}"
     permissions:
       statuses: write
     runs-on: ubuntu-latest
     name: Run CircleCI artifacts redirector
     steps:
       - name: GitHub Action step
-        uses: larsoner/circleci-artifacts-redirector-action@master
+        uses:
+          scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1  # v1.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_TOKEN }}
           artifact-path: 0/doc/build/html/index.html
-          circleci-jobs: docs-python39
+          circleci-jobs: docs-python3
           job-title: View the built docs
 
   post_warnings_as_review:
-    if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
+    if: "${{ github.event.context == 'ci/circleci: docs-python3' }}"
     permissions:
       contents: read
       checks: write

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,6 @@ jobs:
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
-          setup-python-dependencies: false
 
       - name: Build compiled code
         if: matrix.language == 'c-cpp'

.github/workflows/conflictcheck.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs have merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e  # v3.0.0
+        uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168  # v3.0.2
         with:
           dirtyLabel: "status: needs rebase"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"