matplotlib · MiniX16 · May 31, 2025 · May 31, 2025 · Jun 1, 2025 · Jun 1, 2025
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -17,7 +17,7 @@ skip_commits:
 
 clone_depth: 50
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 environment:
 

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -24,14 +24,16 @@ permissions:
 jobs:
   build_sdist:
     if: >-
-      github.event_name == 'push' ||
-      github.event_name == 'pull_request' && (
-        (
-          github.event.action == 'labeled' &&
-          github.event.label.name == 'CI: Run cibuildwheel'
-        ) ||
-        contains(github.event.pull_request.labels.*.name,
-                 'CI: Run cibuildwheel')
+      github.repository == 'matplotlib/matplotlib' && (
+        github.event_name == 'push' ||
+        github.event_name == 'pull_request' && (
+          (
+            github.event.action == 'labeled' &&
+            github.event.label.name == 'CI: Run cibuildwheel'
+          ) ||
+          contains(github.event.pull_request.labels.*.name,
+                   'CI: Run cibuildwheel')
+        )
       )
     name: Build sdist
     runs-on: ubuntu-latest
@@ -78,14 +80,16 @@ jobs:
 
   build_wheels:
     if: >-
-      github.event_name == 'push' ||
-      github.event_name == 'pull_request' && (
-        (
-          github.event.action == 'labeled' &&
-          github.event.label.name == 'CI: Run cibuildwheel'
-        ) ||
-        contains(github.event.pull_request.labels.*.name,
-                 'CI: Run cibuildwheel')
+      github.repository == 'matplotlib/matplotlib' && (
+        github.event_name == 'push' ||
+        github.event_name == 'pull_request' && (
+          (
+            github.event.action == 'labeled' &&
+            github.event.label.name == 'CI: Run cibuildwheel'
+          ) ||
+          contains(github.event.pull_request.labels.*.name,
+                   'CI: Run cibuildwheel')
+        )
       )
     needs: build_sdist
     name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }}
@@ -123,7 +127,9 @@ jobs:
           - os: ubuntu-24.04-arm
             cibw_archs: "aarch64"
           - os: windows-latest
-            cibw_archs: "auto64"
+            cibw_archs: "AMD64"
+          - os: windows-11-arm
+            cibw_archs: "ARM64"
           - os: macos-13
             cibw_archs: "x86_64"
           - os: macos-14
@@ -136,45 +142,54 @@ jobs:
           name: cibw-sdist
           path: dist/
 
+      - name: Build wheels for CPython 3.14
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
+        with:
+          package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
+        env:
+          CIBW_BUILD: "cp314-* cp314t-*"
+          CIBW_ENABLE: "cpython-freethreading cpython-prerelease"
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+          CIBW_BEFORE_TEST: >-
+            python -m pip install
+            --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+            --upgrade --pre --only-binary=:all: contourpy numpy pillow
+
       - name: Build wheels for CPython 3.13
-        uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a  # v2.23.3
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         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@faf86a6ed7efa889faf6996aa23820831055001a  # v2.23.3
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         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@faf86a6ed7efa889faf6996aa23820831055001a  # v2.23.3
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a  # v2.23.3
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "pp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_ENABLE: pypy
-          # No wheels available for Pillow with pp311 yet.
-          CIBW_TEST_SKIP: "pp311*"
-        if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
+        if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest' && matrix.os != 'windows-11-arm'
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
         with:
@@ -183,7 +198,7 @@ jobs:
           if-no-files-found: error
 
   publish:
-    if: github.event_name == 'push' && github.ref_type == 'tag'
+    if: github.repository == 'matplotlib/matplotlib' && github.event_name == 'push' && github.ref_type == 'tag'
     name: Upload release to PyPI
     needs: [build_sdist, build_wheels]
     runs-on: ubuntu-latest
@@ -204,7 +219,7 @@ jobs:
         run: ls dist
 
       - name: Generate artifact attestation for sdist and wheel
-        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd  # v2.3.0
+        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be  # v2.4.0
         with:
           subject-path: dist/matplotlib-*
 

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: GitHub Action step
         uses:
-          scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1  # v1.0.0
+          scientific-python/circleci-artifacts-redirector-action@7eafdb60666f57706a5525a2f5eb76224dc8779b  # v1.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_TOKEN }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,6 +12,7 @@ on:
 
 jobs:
   analyze:
+    if: github.repository == 'matplotlib/matplotlib'
     name: Analyze
     runs-on: ubuntu-latest
     permissions:
@@ -31,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f  # v3.28.18
+        uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e  # v3.29.3
         with:
           languages: ${{ matrix.language }}
 
@@ -42,4 +43,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f  # v3.28.18
+        uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e  # v3.29.3
diff --git a/.github/workflows/conflictcheck.yml b/.github/workflows/conflictcheck.yml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   main:
+    if: github.repository == 'matplotlib/matplotlib'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
@@ -84,7 +84,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559  # v5
+      - uses: cygwin/cygwin-install-action@f2009323764960f80959895c7bc3bb30210afe4d  # v6
         with:
           packages: >-
             ccache gcc-g++ gdb git graphviz libcairo-devel libffi-devel

diff --git a/.github/workflows/reviewdog.yml → .github/workflows/linting.yml b/.github/workflows/reviewdog.yml → .github/workflows/linting.yml
@@ -13,6 +13,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           fetch-depth: 0
+          persist-credentials: false
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
         with:
           python-version: "3.x"

diff --git a/.github/workflows/pr_welcome.yml b/.github/workflows/pr_welcome.yml
@@ -9,7 +9,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7  # v1.3.0
+      - uses: actions/first-interaction@2d4393e6bc0e2efb2e48fba7e06819c3bf61ffc9  # v2.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pr-message: >+

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -64,8 +64,10 @@ jobs:
             python-version: '3.12'
             # https://github.com/matplotlib/matplotlib/issues/29844
             pygobject-ver: '<3.52.0'
-          - os: ubuntu-22.04
+          - name-suffix: "(Extra TeX packages)"
+            os: ubuntu-22.04
             python-version: '3.13'
+            extra-packages: 'texlive-fonts-extra texlive-lang-cyrillic'
             # https://github.com/matplotlib/matplotlib/issues/29844
             pygobject-ver: '<3.52.0'
           - name-suffix: "Free-threaded"
@@ -142,7 +144,8 @@ jobs:
               texlive-latex-recommended \
               texlive-luatex \
               texlive-pictures \
-              texlive-xetex
+              texlive-xetex \
+              ${{ matrix.extra-packages }}
             if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
               sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
             fi
@@ -341,32 +344,29 @@ jobs:
       - name: Cleanup non-failed image files
         if: failure()
         run: |
-          function remove_files() {
-              local extension=$1
-              find ./result_images -type f -name "*-expected*.$extension" | while read file; do
-                  if [[ $file == *"-expected_pdf"* ]]; then
-                      base=${file%-expected_pdf.$extension}_pdf
-                  elif [[ $file == *"-expected_eps"* ]]; then
-                      base=${file%-expected_eps.$extension}_eps
-                  elif [[ $file == *"-expected_svg"* ]]; then
-                      base=${file%-expected_svg.$extension}_svg
-                  else
-                      base=${file%-expected.$extension}
-                  fi
-                  if [[ ! -e "${base}-failed-diff.$extension" ]]; then
-                      if [[ -e "$file" ]]; then
-                          rm "$file"
-                          echo "Removed $file"
-                      fi
-                      if [[ -e "${base}.$extension" ]]; then
-                          rm "${base}.$extension"
-                          echo " Removed ${base}.$extension"
-                      fi
-                  fi
+          find ./result_images -name "*-expected*.png" | while read file; do
+            if [[ $file == *-expected_???.png ]]; then
+              extension=${file: -7:3}
+              base=${file%*-expected_$extension.png}_$extension
+            else
+              extension="png"
+              base=${file%-expected.png}
+            fi
+            if [[ ! -e ${base}-failed-diff.png ]]; then
+              indent=""
+              list=($file $base.png)
+              if [[ $extension != "png" ]]; then
+                list+=(${base%_$extension}-expected.$extension ${base%_$extension}.$extension)
+              fi
+              for to_remove in "${list[@]}"; do
+                if [[ -e $to_remove ]]; then
+                  rm $to_remove
+                  echo "${indent}Removed $to_remove"
+                fi
+                indent+=" "
               done
-          }
-
-          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps";
+            fi
+          done
 
           if [ "$(find ./result_images -mindepth 1 -type d)" ]; then
               find ./result_images/* -type d -empty -delete

diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ pip-wheel-metadata/*
 .tox
 # build subproject files
 subprojects/*/
+subprojects/.*
 !subprojects/packagefiles/
 
 # OS generated files #

diff --git a/ci/schemas/conda-environment.json b/ci/schemas/conda-environment.json
@@ -1,6 +1,6 @@
 {
     "title": "conda environment file",
-    "description": "Support for conda's enviroment.yml files (e.g. `conda env export > environment.yml`)",
+    "description": "Support for conda's environment.yml files (e.g. `conda env export > environment.yml`)",
     "id": "https://raw.githubusercontent.com/Microsoft/vscode-python/main/schemas/conda-environment.json",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "definitions": {

diff --git a/doc/_embedded_plots/grouped_bar.py b/doc/_embedded_plots/grouped_bar.py
@@ -0,0 +1,15 @@
+import matplotlib.pyplot as plt
+
+categories = ['A', 'B']
+data0 = [1.0, 3.0]
+data1 = [1.4, 3.4]
+data2 = [1.8, 3.8]
+
+fig, ax = plt.subplots(figsize=(4, 2.2))
+ax.grouped_bar(
+    [data0, data1, data2],
+    tick_labels=categories,
+    labels=['dataset 0', 'dataset 1', 'dataset 2'],
+    colors=['#1f77b4', '#58a1cf', '#abd0e6'],
+)
+ax.legend()
diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst
@@ -67,6 +67,7 @@ Basic
    Axes.bar
    Axes.barh
    Axes.bar_label
+   Axes.grouped_bar
 
    Axes.stem
    Axes.eventplot

diff --git a/doc/api/bezier_api.rst b/doc/api/bezier_api.rst
@@ -5,4 +5,5 @@
 .. automodule:: matplotlib.bezier
    :members:
    :undoc-members:
+   :special-members: __call__
    :show-inheritance:
diff --git a/doc/api/colors_api.rst b/doc/api/colors_api.rst
@@ -21,6 +21,7 @@ Color norms
    :toctree: _as_gen/
    :template: autosummary.rst
 
+   Norm
    Normalize
    NoNorm
    AsinhNorm

diff --git a/doc/api/next_api_changes/behavior/29958-TH.rst b/doc/api/next_api_changes/behavior/29958-TH.rst
@@ -0,0 +1,8 @@
+``Axes.add_collection(..., autolim=True)`` updates view limits
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Axes.add_collection(..., autolim=True)`` has so far only updated the data limits.
+Users needed to additionally call `.Axes.autoscale_view` to update the view limits.
+View limits are now updated as well if ``autolim=True``, using a lazy internal
+update mechanism, so that the costs only apply once also if you add multiple
+collections.
diff --git a/doc/api/next_api_changes/behavior/30272-ES.rst b/doc/api/next_api_changes/behavior/30272-ES.rst
@@ -0,0 +1,2 @@
+``font_manager.findfont`` logs if selected font weight does not match requested
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/api/next_api_changes/deprecations/29993-AL.rst b/doc/api/next_api_changes/deprecations/29993-AL.rst
@@ -0,0 +1,4 @@
+``testing.widgets.mock_event`` and ``testing.widgets.do_event``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated.  Directly construct Event objects (typically `.MouseEvent`
+or `.KeyEvent`) and pass them to ``canvas.callbacks.process()`` instead.
diff --git a/doc/api/next_api_changes/deprecations/30044-AL.rst b/doc/api/next_api_changes/deprecations/30044-AL.rst
@@ -0,0 +1,12 @@
+``FT2Image``
+~~~~~~~~~~~~
+... is deprecated.  Use 2D uint8 ndarrays instead.  In particular:
+
+- The ``FT2Image`` constructor took ``width, height`` as separate parameters
+  but the ndarray constructor takes ``(height, width)`` as single tuple
+  parameter.
+- `.FT2Font.draw_glyph_to_bitmap` now (also) takes 2D uint8 arrays as input.
+- ``FT2Image.draw_rect_filled`` should be replaced by directly setting pixel
+  values to black.
+- The ``image`` attribute of the object returned by ``MathTextParser("agg").parse``
+  is now a 2D uint8 array.
diff --git a/doc/api/next_api_changes/deprecations/30070-OG.rst b/doc/api/next_api_changes/deprecations/30070-OG.rst
@@ -0,0 +1,4 @@
+``BezierSegment.point_at_t``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+... is deprecated. Instead, it is possible to call the BezierSegment with an argument.
diff --git a/doc/api/next_api_changes/deprecations/30088-AL.rst b/doc/api/next_api_changes/deprecations/30088-AL.rst
@@ -0,0 +1,4 @@
+*fontfile* parameter of ``PdfFile.createType1Descriptor``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This parameter is deprecated; all relevant pieces of information are now
+directly extracted from the *t1font* argument.
diff --git a/doc/api/next_api_changes/deprecations/30163-AL.rst b/doc/api/next_api_changes/deprecations/30163-AL.rst
@@ -0,0 +1,9 @@
+``matplotlib.style.core``
+~~~~~~~~~~~~~~~~~~~~~~~~~
+The ``matplotlib.style.core`` module is deprecated.  All APIs intended for
+public use are now available in `matplotlib.style` directly (including
+``USER_LIBRARY_PATHS``, which was previously not reexported).
+
+The following APIs of ``matplotlib.style.core`` have been deprecated with no
+replacement: ``BASE_LIBRARY_PATH``, ``STYLE_EXTENSION``, ``STYLE_BLACKLIST``,
+``update_user_library``, ``read_style_directory``, ``update_nested_dict``.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		``font_manager.findfont`` logs if selected font weight does not match requested
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~