Merge branch 'matplotlib:main' into logo_guide

jeromefv · web-flow · commit 40b202abcf34 · 2025-10-17T09:16:44.000-07:00
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@753c925c8d1ac6fede23781875376600628d9b5d  # v3.0.0
+      - uses: actions/first-interaction@1c4688942c71f71d4f5502a26ea67c331730fa4d  # v3.1.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           pr_message: >+
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -36,3 +36,4 @@ jobs:
           ascending: true
           exempt-issue-labels: "keep"
           exempt-pr-labels: "keep,status: orphaned PR"
+          sort-by: updated
diff --git a/doc/_static/switcher.json b/doc/_static/switcher.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "3.10 (stable)",
-        "version": "3.10.6",
+        "version": "3.10.7",
         "url": "https://matplotlib.org/stable/",
         "preferred": true
     },
diff --git a/doc/_static/zenodo_cache/17298696.svg b/doc/_static/zenodo_cache/17298696.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="190.84375" height="20">
+        <linearGradient id="b" x2="0" y2="100%">
+            <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+            <stop offset="1" stop-opacity=".1"/>
+        </linearGradient>
+        <mask id="a" width="190.84375" height="20">
+            <rect width="190.84375" height="20" rx="3"
+            fill="#fff"/>
+        </mask>
+        <g mask="url(#a)">
+            <path fill="#555" d="M0 0h31.375v20H0z" />
+            <path fill="#007ec6"
+            d="M31.375 0h159.46875v20H31.375z"
+            />
+            <path fill="url(#b)" d="M0 0h190.84375v20H0z" />
+        </g>
+        <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,
+        Verdana,Geneva,sans-serif" font-size="11">
+            <text x="16.1875" y="15" fill="#010101"
+            fill-opacity=".3">
+                DOI
+            </text>
+            <text x="16.1875" y="14">
+                DOI
+            </text>
+            <text x="110.609375"
+            y="15" fill="#010101" fill-opacity=".3">
+                10.5281/zenodo.17298696
+            </text>
+            <text x="110.609375" y="14">
+                10.5281/zenodo.17298696
+            </text>
+        </g>
+    </svg>
diff --git a/doc/api/next_api_changes/behavior/30634-AL.rst b/doc/api/next_api_changes/behavior/30634-AL.rst
@@ -0,0 +1,6 @@
+hist2d no longer forces axes limits
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Previously, `.Axes.hist2d` would force the axes x and y limits to the extents
+of the histogrammed data, ignoring any other artists.  `.Axes.hist2d` now
+behaves similarly to `.Axes.imshow`: axes limits are updated to fit the data,
+but autoscaling is not otherwise disabled.
diff --git a/doc/api/prev_api_changes/api_changes_3.10.7.rst b/doc/api/prev_api_changes/api_changes_3.10.7.rst
@@ -0,0 +1,10 @@
+API Changes for 3.10.7
+======================
+
+Development
+-----------
+
+New minimum version of pyparsing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The minimum required version of ``pyparsing`` has been updated from 2.3.1 to 3.0.0.
diff --git a/doc/project/citing.rst b/doc/project/citing.rst
@@ -32,6 +32,9 @@ By version
 .. START OF AUTOGENERATED
 
 
+v3.10.7
+   .. image:: ../_static/zenodo_cache/17298696.svg
+      :target:  https://doi.org/10.5281/zenodo.17298696
 v3.10.6
    .. image:: ../_static/zenodo_cache/16999430.svg
       :target:  https://doi.org/10.5281/zenodo.16999430
diff --git a/doc/release/github_stats.rst b/doc/release/github_stats.rst
@@ -2,24 +2,24 @@
 
 .. _github-stats:
 
-GitHub statistics for 3.10.6 (Aug 29, 2025)
+GitHub statistics for 3.10.7 (Oct 08, 2025)
 ===========================================
 
-GitHub statistics for 2024/12/14 (tag: v3.10.0) - 2025/08/29
+GitHub statistics for 2024/12/14 (tag: v3.10.0) - 2025/10/08
 
 These lists are automatically generated, and may be incomplete or contain duplicates.
 
-We closed 4 issues and merged 19 pull requests.
-The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/103?closed=1>`__
+We closed 4 issues and merged 16 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/105?closed=1>`__
 
-The following 31 authors contributed 380 commits.
+The following 32 authors contributed 422 commits.
 
-* Alan Burlot
+* Aasma Gupta
+* AASMA GUPTA
 * Antony Lee
 * Christine P. Chai
 * David Stansby
 * dependabot[bot]
-* Doron Behar
 * Elliott Sales de Andrade
 * G.D. McBain
 * Greg Lucas
@@ -43,39 +43,37 @@ The following 31 authors contributed 380 commits.
 * saikarna913
 * Scott Shambaugh
 * Thomas A Caswell
+* Tim Heap
 * Tim Hoffmann
 * Trygve Magnus Ræder
 
 GitHub issues and pull requests:
 
-Pull Requests (19):
-
-* :ghpull:`30487`: Backport PR #30484 on branch v3.10.x (FIX: be more cautious about checking widget size)
-* :ghpull:`30484`: FIX: be more cautious about checking widget size
-* :ghpull:`30481`: Backport PR #30394 on branch v3.10.x (ENH: Gracefully handle python-build-standalone ImportError with Tk)
-* :ghpull:`30477`: Backport PR #30476 on branch v3.10.x (ci: Remove cibuildwheel override for win_arm64/Py3.14)
-* :ghpull:`30394`: ENH: Gracefully handle python-build-standalone ImportError with Tk
-* :ghpull:`30476`: ci: Remove cibuildwheel override for win_arm64/Py3.14
-* :ghpull:`30461`: Backport PR #30451 on branch v3.10.x (doc: factor out quick install tab for reuse)
-* :ghpull:`30448`: Backport PR #30412 on branch v3.10.x ({Check,Radio}Buttons: Improve docs of label_props)
-* :ghpull:`30412`: {Check,Radio}Buttons: Improve docs of label_props
-* :ghpull:`30445`: Backport PR #30444 on branch v3.10.x (Small correction of a typo in the galleries: axis instead of axes)
-* :ghpull:`30444`: Small correction of a typo in the galleries: axis instead of axes
-* :ghpull:`30430`: Backport PR #30426 on branch v3.10.x (Fix a race condition in TexManager.make_dvi.)
-* :ghpull:`30434`: Backport PR #30426: Fix a race condition in TexManager.make_dvi & make_png.
-* :ghpull:`30431`: Use pathlib in texmanager.
-* :ghpull:`30428`: Backport PR #30399 on branch v3.10.x (Qt: Fix HiDPI handling on X11/Windows)
-* :ghpull:`30426`: Fix a race condition in TexManager.make_dvi.
-* :ghpull:`30399`: Qt: Fix HiDPI handling on X11/Windows
-* :ghpull:`30415`: Backport PR #30414 on branch v3.10.x (DOC: update Cartopy url)
-* :ghpull:`30414`: DOC: update Cartopy url
+Pull Requests (16):
+
+* :ghpull:`30628`: Backport PR #30626 on branch v3.10.x (MNT: Fix new F401 unused imports warnings)
+* :ghpull:`30626`: MNT: Fix new F401 unused imports warnings
+* :ghpull:`30589`: Backport PR #29745: Use PEP8 style method and function names from
+* :ghpull:`30614`: Backport PR #30612 on branch v3.10.x (MNT: update black pin)
+* :ghpull:`30612`: MNT: update black pin
+* :ghpull:`30572`: Backport PR #30571 on branch v3.10.x (CI: remove macos13)
+* :ghpull:`30571`: CI: remove macos13
+* :ghpull:`30570`: Backport PR #30558 on branch v3.10.x (Fix stubtest with mypy 18)
+* :ghpull:`30558`: Fix stubtest with mypy 18
+* :ghpull:`30540`: Backport PR #30539 on branch v3.10.x (Fix scale_unit/scale_units typo in quiver docs)
+* :ghpull:`30539`: Fix scale_unit/scale_units typo in quiver docs
+* :ghpull:`30518`: Backport PR #30497 on branch v3.10.x (TST: Use a temporary directory for test_save_figure_return)
+* :ghpull:`30497`: TST: Use a temporary directory for test_save_figure_return
+* :ghpull:`30506`: Backport PR #30490 on branch v3.10.x (Fix SVG rendering error in def update_background)
+* :ghpull:`30490`: Fix SVG rendering error in def update_background
+* :ghpull:`30494`: Backport PR #30492 on branch v3.10.x (DOC: pytz link should be from PyPI)
 
 Issues (4):
 
-* :ghissue:`29618`: [Bug]: FigureCanvasQT is seemingly prematurely freed under certain conditions
-* :ghissue:`30390`: [ENH]: Gracefully handle python-build-standalone ImportError
-* :ghissue:`30420`: [ENH]: Support parallel plotting
-* :ghissue:`30386`: BUG: Qt hi-dpi regression on windows and X11 with mpl 3.10.5
+* :ghissue:`30611`: [MNT]: black version
+* :ghissue:`30551`: [Bug]: Mypy stubtest failure on disjoint_base
+* :ghissue:`30493`: [Bug]: test_save_figure_return seems flaky
+* :ghissue:`30485`: [Bug]: figures with SpanSelector(..., useblit=True) can't be saved to SVG or PDF
 
 
 Previous GitHub statistics
diff --git a/doc/release/prev_whats_new/github_stats_3.10.6.rst b/doc/release/prev_whats_new/github_stats_3.10.6.rst
@@ -0,0 +1,76 @@
+.. _github-stats-3_10_6:
+
+GitHub statistics for 3.10.6 (Aug 29, 2025)
+===========================================
+
+GitHub statistics for 2024/12/14 (tag: v3.10.0) - 2025/08/29
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+We closed 4 issues and merged 19 pull requests.
+The full list can be seen `on GitHub <https://github.com/matplotlib/matplotlib/milestone/103?closed=1>`__
+
+The following 31 authors contributed 380 commits.
+
+* Alan Burlot
+* Antony Lee
+* Christine P. Chai
+* David Stansby
+* dependabot[bot]
+* Doron Behar
+* Elliott Sales de Andrade
+* G.D. McBain
+* Greg Lucas
+* hannah
+* hu-xiaonan
+* Ian Thomas
+* Inês Cachola
+* Jody Klymak
+* Jouni K. Seppänen
+* Khushi_29
+* Kyle Sunden
+* Lumberbot (aka Jack)
+* N R Navaneet
+* Nathan G. Wiseman
+* Oscar Gustafsson
+* Praful Gulani
+* Qian Zhang
+* Raphael Erik Hviding
+* Roman
+* Ruth Comer
+* saikarna913
+* Scott Shambaugh
+* Thomas A Caswell
+* Tim Hoffmann
+* Trygve Magnus Ræder
+
+GitHub issues and pull requests:
+
+Pull Requests (19):
+
+* :ghpull:`30487`: Backport PR #30484 on branch v3.10.x (FIX: be more cautious about checking widget size)
+* :ghpull:`30484`: FIX: be more cautious about checking widget size
+* :ghpull:`30481`: Backport PR #30394 on branch v3.10.x (ENH: Gracefully handle python-build-standalone ImportError with Tk)
+* :ghpull:`30477`: Backport PR #30476 on branch v3.10.x (ci: Remove cibuildwheel override for win_arm64/Py3.14)
+* :ghpull:`30394`: ENH: Gracefully handle python-build-standalone ImportError with Tk
+* :ghpull:`30476`: ci: Remove cibuildwheel override for win_arm64/Py3.14
+* :ghpull:`30461`: Backport PR #30451 on branch v3.10.x (doc: factor out quick install tab for reuse)
+* :ghpull:`30448`: Backport PR #30412 on branch v3.10.x ({Check,Radio}Buttons: Improve docs of label_props)
+* :ghpull:`30412`: {Check,Radio}Buttons: Improve docs of label_props
+* :ghpull:`30445`: Backport PR #30444 on branch v3.10.x (Small correction of a typo in the galleries: axis instead of axes)
+* :ghpull:`30444`: Small correction of a typo in the galleries: axis instead of axes
+* :ghpull:`30430`: Backport PR #30426 on branch v3.10.x (Fix a race condition in TexManager.make_dvi.)
+* :ghpull:`30434`: Backport PR #30426: Fix a race condition in TexManager.make_dvi & make_png.
+* :ghpull:`30431`: Use pathlib in texmanager.
+* :ghpull:`30428`: Backport PR #30399 on branch v3.10.x (Qt: Fix HiDPI handling on X11/Windows)
+* :ghpull:`30426`: Fix a race condition in TexManager.make_dvi.
+* :ghpull:`30399`: Qt: Fix HiDPI handling on X11/Windows
+* :ghpull:`30415`: Backport PR #30414 on branch v3.10.x (DOC: update Cartopy url)
+* :ghpull:`30414`: DOC: update Cartopy url
+
+Issues (4):
+
+* :ghissue:`29618`: [Bug]: FigureCanvasQT is seemingly prematurely freed under certain conditions
+* :ghissue:`30390`: [ENH]: Gracefully handle python-build-standalone ImportError
+* :ghissue:`30420`: [ENH]: Support parallel plotting
+* :ghissue:`30386`: BUG: Qt hi-dpi regression on windows and X11 with mpl 3.10.5
diff --git a/doc/release/release_notes.rst b/doc/release/release_notes.rst
@@ -19,9 +19,11 @@ Version 3.10
     :maxdepth: 1
 
     prev_whats_new/whats_new_3.10.0.rst
+    ../api/prev_api_changes/api_changes_3.10.7.rst
     ../api/prev_api_changes/api_changes_3.10.1.rst
     ../api/prev_api_changes/api_changes_3.10.0.rst
     github_stats.rst
+    prev_whats_new/github_stats_3.10.6.rst
     prev_whats_new/github_stats_3.10.5.rst
     prev_whats_new/github_stats_3.10.3.rst
     prev_whats_new/github_stats_3.10.1.rst
diff --git a/galleries/users_explain/colors/colormapnorms.py b/galleries/users_explain/colors/colormapnorms.py
@@ -281,6 +281,32 @@
 cb.set_ticks([-500, 0, 1000, 2000, 3000, 4000])
 plt.show()
 
+# %%
+# Using a linear scale on the colormap
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+#
+# By default, colorbars adopt the same axis scaling as their associated norm.
+# For example, for a `.TwoSlopeNorm`, colormap segments are distributed
+# linearly and the colorbar ticks positions are spaced non-linearly (as above,
+# and the left-hand colorbar below). To make the tick spacing linear instead,
+# you can change the scale by calling ``cb.ax.set_yscale('linear')``, as shown
+# in the right-hand colorbar below. The ticks will then be evenly spaced, the
+# colormap will appear compressed in the smaller of the two slope regions.
+
+fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(10, 4))
+divnorm = colors.TwoSlopeNorm(vmin=-500., vcenter=0, vmax=4000)
+
+for ax, title in zip([ax1, ax2],
+                     ['Default: Scaled colorbar', 'Linear colorbar spacing']):
+    pcm = ax.pcolormesh(longitude, latitude, topo, rasterized=True, norm=divnorm,
+                        cmap=terrain_map, shading='auto')
+    ax.set_aspect(1 / np.cos(np.deg2rad(49)))
+    ax.set_title(title)
+    cb = fig.colorbar(pcm, ax=ax, shrink=0.6)
+    cb.set_ticks(np.arange(-500, 4001, 500))
+
+# Set linear scale for the right colorbar
+cb.ax.set_yscale('linear')
 
 # %%
 # FuncNorm: Arbitrary function normalization
@@ -290,6 +316,7 @@
 # `~.colors.FuncNorm` to define your own.  Note that this example is the same
 # as `~.colors.PowerNorm` with a power of 0.5:
 
+
 def _forward(x):
     return np.sqrt(x)
 
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -7772,13 +7772,15 @@ def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
 
         Notes
         -----
-        - Currently ``hist2d`` calculates its own axis limits, and any limits
-          previously set are ignored.
-        - Rendering the histogram with a logarithmic color scale is
-          accomplished by passing a `.colors.LogNorm` instance to the *norm*
-          keyword argument. Likewise, power-law normalization (similar
-          in effect to gamma correction) can be accomplished with
-          `.colors.PowerNorm`.
+        Rendering the histogram with a logarithmic color scale is accomplished
+        by passing a `.colors.LogNorm` instance to the *norm* keyword
+        argument. Likewise, power-law normalization (similar in effect to gamma
+        correction) can be accomplished with `.colors.PowerNorm`.
+
+        .. versionchanged:: 3.11
+           Previously, `~.Axes.hist2d` would force the axes limits to match the
+           extents of the histogram; now, autoscaling also takes other plot
+           elements into account.
         """
 
         h, xedges, yedges = np.histogram2d(x, y, bins=bins, range=range,
@@ -7790,8 +7792,6 @@ def hist2d(self, x, y, bins=10, range=None, density=False, weights=None,
             h[h > cmax] = None
 
         pc = self.pcolormesh(xedges, yedges, h.T, **kwargs)
-        self.set_xlim(xedges[0], xedges[-1])
-        self.set_ylim(yedges[0], yedges[-1])
 
         return h, xedges, yedges, pc
 
@@ -8967,6 +8967,14 @@ def violin(self, vpstats, positions=None, vert=None,
 
             .. versionadded:: 3.11
 
+            For backward compatibility, if *facecolor* is not given, the body
+            will get an Artist-level transparency `alpha <.Artist.set_alpha>`
+            of 0.3, which will persist if you afterwards change the facecolor,
+            e.g. via ``result['bodies'][0].set_facecolor('red')``.
+            If *facecolor* is given, there is no Artist-level transparency.
+            To set transparency for *facecolor* or *edgecolor* use
+            ``(color, alpha)`` tuples.
+
         linecolor : :mpltype:`color` or list of :mpltype:`color`, optional
             If provided, will set the line color(s) of the violins (the
             horizontal and vertical spines and body edges).
@@ -9074,13 +9082,14 @@ def cycle_color(color, alpha=None):
 
         if facecolor is not None:
             facecolor = cycle_color(facecolor)
+            body_artist_alpha = None
         else:
-            default_facealpha = 0.3
+            body_artist_alpha = 0.3
             # Use default colors if user doesn't provide them
             if mpl.rcParams['_internal.classic_mode']:
-                facecolor = cycle_color('y', alpha=default_facealpha)
+                facecolor = cycle_color('y')
             else:
-                facecolor = cycle_color(next_color, alpha=default_facealpha)
+                facecolor = cycle_color(next_color)
 
         if mpl.rcParams['_internal.classic_mode']:
             # Classic mode uses patch.force_edgecolor=True, so we need to
@@ -9129,7 +9138,8 @@ def cycle_color(color, alpha=None):
             bodies += [fill(stats['coords'],
                             -vals + pos if side in ['both', 'low'] else pos,
                             vals + pos if side in ['both', 'high'] else pos,
-                            facecolor=facecolor, edgecolor=body_edgecolor)]
+                            facecolor=facecolor, edgecolor=body_edgecolor,
+                            alpha=body_artist_alpha)]
             means.append(stats['mean'])
             mins.append(stats['min'])
             maxes.append(stats['max'])
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -1268,7 +1268,8 @@ def draw(self, renderer):
         if edgecolors.size == 0:
             edgecolors = ("none",)
         for idx in range(n_paths):
-            with cbook._setattr_cm(self, _paths=[paths[idx]]), self._cm_set(
+            with self._cm_set(
+                paths=[paths[idx]],
                 hatch=self.hatches[idx % len(self.hatches)],
                 array=[self.get_array()[idx]],
                 linewidths=[self.get_linewidths()[idx % len(self.get_linewidths())]],
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
diff --git a/tools/cache_zenodo_svg.py b/tools/cache_zenodo_svg.py

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "3.10 (stable)",`
`4`		`- "version": "3.10.6",`
	`4`	`+ "version": "3.10.7",`
`5`	`5`	`"url": "https://matplotlib.org/stable/",`
`6`	`6`	`"preferred": true`
`7`	`7`	`},`