Merge branch 'matplotlib:main' into logo_guide

Author: jeromefv

ci/mypy-stubtest-allowlist.txt

@@ -49,3 +49,6 @@ matplotlib\.figure\.FigureBase\.get_figure
 
 # getitem method only exists for 3.10 deprecation backcompatability
 matplotlib\.inset\.InsetIndicator\.__getitem__
+
+# only defined in stubs; not present at runtime
+matplotlib\.animation\.EventSourceProtocol

doc/api/next_api_changes/deprecations/30531-TH.rst

@@ -0,0 +1,16 @@
+In-place modifications of colormaps
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Colormaps are planned to become immutable in the long term.
+
+As a first step, in-place modifications of colormaps are now pending-deprecated.
+This affects the following methods of `.Colormap`:
+
+- `.Colormap.set_bad` - use ``cmap.with_extremes(bad=...)`` instead
+- `.Colormap.set_under` - use ``cmap.with_extremes(under=...)`` instead
+- `.Colormap.set_over` - use ``cmap.with_extremes(over=...)`` instead
+- `.Colormap.set_extremes` - use ``cmap.with_extremes(...)`` instead
+
+Use the respective `.Colormap.with_extremes` and appropriate keyword arguments
+instead which returns a copy of the colormap (available since matplotlib 3.4).
+Alternatively, if you create the colormap yourself, you can also pass the
+respective arguments to the constructor (available since matplotlib 3.11).

doc/release/next_whats_new/scroll_to_zoom.rst

@@ -2,7 +2,8 @@ Zooming using mouse wheel
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``Ctrl+MouseWheel`` can be used to zoom in the plot windows.
+Additionally, ``x+MouseWheel`` zooms only the x-axis and ``y+MouseWheel`` zooms only the y-axis.
 
-The zoom focusses on the mouse pointer, and keeps the aspect ratio of the axes.
+The zoom focusses on the mouse pointer. With ``Ctrl``, the axes aspect ratio is kept; with ``x`` or ``y``, only the respective axis is scaled.
 
 Zooming is currently only supported on rectilinear Axes.

doc/release/next_whats_new/violin_stats.rst

@@ -0,0 +1,31 @@
+``violin_stats`` simpler *method* parameter
+-------------------------------------------
+
+The *method* parameter of `~.cbook.violin_stats` may now be specified as tuple of
+strings, and has a new default ``("GaussianKDE", "scott")``.  Calling
+`~.cbook.violin_stats` followed by `~.Axes.violin` is therefore now equivalent to
+calling `~.Axes.violinplot`.
+
+.. plot::
+    :include-source: true
+    :alt: Example showing violin_stats followed by violin gives the same result as violinplot
+
+    import matplotlib.pyplot as plt
+    from matplotlib.cbook import violin_stats
+    import numpy as np
+
+    rng = np.random.default_rng(19680801)
+    data = rng.normal(size=(10, 3))
+
+    fig, (ax1, ax2) = plt.subplots(ncols=2, layout='constrained', figsize=(6.4, 3.5))
+
+    # Create the violin plot in one step
+    ax1.violinplot(data)
+    ax1.set_title('One Step')
+
+    # Process the data and then create the violin plot
+    vstats = violin_stats(data)
+    ax2.violin(vstats)
+    ax2.set_title('Two Steps')
+
+    plt.show()

environment.yml

@@ -53,7 +53,7 @@ dependencies:
       - sphinxcontrib-video>=0.2.1
       - pikepdf
   # testing
-  - black<24
+  - black<26
   - coverage
   - gtk4
   - ipykernel

galleries/examples/shapes_and_collections/donut.py

@@ -15,27 +15,21 @@
 
 
 def wise(v):
-    if v == 1:
-        return "CCW"
-    else:
-        return "CW"
+    return {+1: "CCW", -1: "CW"}[v]
 
 
 def make_circle(r):
     t = np.arange(0, np.pi * 2.0, 0.01)
-    t = t.reshape((len(t), 1))
     x = r * np.cos(t)
     y = r * np.sin(t)
-    return np.hstack((x, y))
+    return np.column_stack((x, y))
 
-Path = mpath.Path
 
 fig, ax = plt.subplots()
 
 inside_vertices = make_circle(0.5)
 outside_vertices = make_circle(1.0)
-codes = np.ones(
-    len(inside_vertices), dtype=mpath.Path.code_type) * mpath.Path.LINETO
+codes = np.full(len(inside_vertices), mpath.Path.LINETO)
 codes[0] = mpath.Path.MOVETO
 
 for i, (inside, outside) in enumerate(((1, 1), (1, -1), (-1, 1), (-1, -1))):
@@ -44,23 +38,20 @@ def make_circle(r):
     vertices = np.concatenate((outside_vertices[::outside],
                                inside_vertices[::inside]))
     # Shift the path
-    vertices[:, 0] += i * 2.5
+    vertices += (i * 2.5, 0)
     # The codes will be all "LINETO" commands, except for "MOVETO"s at the
     # beginning of each subpath
     all_codes = np.concatenate((codes, codes))
     # Create the Path object
     path = mpath.Path(vertices, all_codes)
-    # Add plot it
+    # And plot it
     patch = mpatches.PathPatch(path, facecolor='#885500', edgecolor='black')
     ax.add_patch(patch)
 
     ax.annotate(f"Outside {wise(outside)},\nInside {wise(inside)}",
                 (i * 2.5, -1.5), va="top", ha="center")
 
-ax.set_xlim(-2, 10)
-ax.set_ylim(-3, 2)
-ax.set_title('Mmm, donuts!')
-ax.set_aspect(1.0)
+ax.set(xlim=(-2, 10), ylim=(-3, 2), aspect=1, title="Mmm, donuts!")
 plt.show()
 
 # %%

galleries/users_explain/text/mathtext.py

@@ -370,4 +370,4 @@
 # If a particular symbol does not have a name (as is true of many of the more
 # obscure symbols in the STIX fonts), Unicode characters can also be used::
 #
-#    r'$\u23ce$'
+#    '$\u23ce$'

lib/matplotlib/animation.py

@@ -861,7 +861,7 @@ class Animation:
     fig : `~matplotlib.figure.Figure`
         The figure object used to get needed events, such as draw or resize.
 
-    event_source : object, optional
+    event_source : object
         A class that can run a callback when desired events
         are generated, as well as be stopped and started.
 
@@ -877,7 +877,7 @@ class Animation:
     FuncAnimation,  ArtistAnimation
     """
 
-    def __init__(self, fig, event_source=None, blit=False):
+    def __init__(self, fig, event_source, blit=False):
         self._draw_was_started = False
 
         self._fig = fig

lib/matplotlib/animation.pyi

@@ -6,7 +6,7 @@ from matplotlib.artist import Artist
 from matplotlib.backend_bases import TimerBase
 from matplotlib.figure import Figure
 
-from typing import Any
+from typing import Any, Protocol
 
 subprocess_creation_flags: int
 
@@ -152,11 +152,17 @@ class HTMLWriter(FileMovieWriter):
     def grab_frame(self, **savefig_kwargs): ...
     def finish(self) -> None: ...
 
+class EventSourceProtocol(Protocol):
+    def add_callback(self, func: Callable): ...
+    def remove_callback(self, func: Callable): ...
+    def start(self): ...
+    def stop(self): ...
+
 class Animation:
     frame_seq: Iterable[Artist]
-    event_source: Any
+    event_source: EventSourceProtocol | None  # TODO: We should remove None
     def __init__(
-        self, fig: Figure, event_source: Any | None = ..., blit: bool = ...
+        self, fig: Figure, event_source: EventSourceProtocol, blit: bool = ...
     ) -> None: ...
     def __del__(self) -> None: ...
     def save(

lib/matplotlib/axes/_axes.py

@@ -9006,6 +9006,8 @@ def violin(self, vpstats, positions=None, vert=None,
         --------
         violinplot :
             Draw a violin plot from data instead of pre-computed statistics.
+        .cbook.violin_stats:
+            Calculate a *vpstats* dictionary from data, suitable for passing to violin.
         """
 
         # Statistical quantities to be plotted on the violins