Merge branch 'matplotlib:main' into logo_guide

Author: jeromefv

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01  # v3.30.1
+        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3  # v3.30.3
         with:
           languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01  # v3.30.1
+        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3  # v3.30.3

.github/workflows/tests.yml

@@ -60,10 +60,6 @@ jobs:
             extra-requirements: '-r requirements/testing/extra.txt'
             # https://github.com/matplotlib/matplotlib/issues/29844
             pygobject-ver: '<3.52.0'
-          - os: ubuntu-22.04-arm
-            python-version: '3.12'
-            # https://github.com/matplotlib/matplotlib/issues/29844
-            pygobject-ver: '<3.52.0'
           - name-suffix: "(Extra TeX packages)"
             os: ubuntu-22.04
             python-version: '3.13'
@@ -77,14 +73,17 @@ jobs:
             pygobject-ver: '<3.52.0'
           - os: ubuntu-24.04
             python-version: '3.12'
-          - os: macos-13  # This runner is on Intel chips.
-            # merge numpy and pandas install in nighties test when this runner is dropped
+          - os: ubuntu-24.04-arm
+            python-version: '3.12'
+          - os: macos-14  # This runner is on M1 (arm64) chips.
             python-version: '3.11'
+            # https://github.com/matplotlib/matplotlib/issues/29732
+            pygobject-ver: '<3.52.0'
           - os: macos-14  # This runner is on M1 (arm64) chips.
             python-version: '3.12'
             # https://github.com/matplotlib/matplotlib/issues/29732
             pygobject-ver: '<3.52.0'
-          - os: macos-14  # This runner is on M1 (arm64) chips.
+          - os: macos-15  # This runner is on M1 (arm64) chips.
             python-version: '3.13'
             # https://github.com/matplotlib/matplotlib/issues/29732
             pygobject-ver: '<3.52.0'
@@ -149,7 +148,7 @@ jobs:
             if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
               sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
             fi
-            if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
+            if [[ "${{ matrix.os }}" = ubuntu-22.04 ]]; then
               sudo apt-get install -yy --no-install-recommends \
                 gir1.2-gtk-4.0 \
                 libgirepository1.0-dev
@@ -256,7 +255,7 @@ jobs:
             )
 
           # PyQt5 does not have any wheels for ARM on Linux.
-          if [[ "${{ matrix.os }}" != 'ubuntu-22.04-arm' ]]; then
+          if [[ "${{ matrix.os }}" != 'ubuntu-24.04-arm' ]]; then
             python -mpip install --upgrade --only-binary :all: pyqt5 &&
               python -c 'import PyQt5.QtCore' &&
               echo 'PyQt5 is available' ||
@@ -297,13 +296,7 @@ jobs:
           python -m pip install pytz tzdata  # Must be installed for Pandas.
           python -m pip install \
             --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
-            --upgrade --only-binary=:all: numpy
-          # wheels for intel osx is not always available on nightly wheels index, merge this back into
-          # the above install command when the OSX-13 (intel) runners are dropped.
-          python -m pip install \
-            --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
-            --upgrade --only-binary=:all: pandas || true
-
+            --upgrade --only-binary=:all: numpy pandas
 
       - name: Install Matplotlib
         run: |
@@ -377,7 +370,7 @@ jobs:
         run: |
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
             LCOV_IGNORE_ERRORS=','  # do not ignore any lcov errors by default
-            if [[ "${{ matrix.os }}" = ubuntu-24.04 ]]; then
+            if [[ "${{ matrix.os }}" = ubuntu-24.04 || "${{ matrix.os }}" = ubuntu-24.04-arm ]]; then
               # filter mismatch and unused-entity errors detected by lcov 2.x
               LCOV_IGNORE_ERRORS='mismatch,unused'
             fi

doc/devel/pr_guide.rst

@@ -109,9 +109,10 @@ Workflow
 * The PR should :ref:`target the main branch <pr-branch-selection>`.
 * Tag with descriptive :ref:`labels <pr-labels>`.
 * Set the :ref:`milestone <pr-milestones>`.
-* Keep an eye on the :ref:`number of commits <pr-squashing>`.
+* :ref:`Review <pr-review>` the contents.
 * Approve if all of the above topics are handled.
-* :ref:`Merge  <pr-merging>` if a sufficient number of approvals is reached.
+* Keep an eye on the :ref:`number of commits <pr-squashing>`.
+* :ref:`Merge <pr-merging>` if a :ref:`sufficient number of approvals <pr-approval>` is reached.
 
 .. _pr-guidelines-details:
 
@@ -190,10 +191,27 @@ All Pull Requests should target the main branch. The milestone tag triggers
 an :ref:`automatic backport <automated-backports>` for milestones which have
 a corresponding branch.
 
-.. _pr-merging:
+.. _pr-review:
 
-Merging
--------
+Review
+------
+
+* Do not let perfect be the enemy of the good, particularly for
+  documentation or example PRs.  If you find yourself making many
+  small suggestions, either open a PR against the original branch,
+  push changes to the contributor branch, or merge the PR and then
+  open a new PR against upstream.
+
+* If you push to a contributor branch leave a comment explaining what
+  you did, ex "I took the liberty of pushing a small clean-up PR to
+  your branch, thanks for your work.".  If you are going to make
+  substantial changes to the code or intent of the PR please check
+  with the contributor first.
+
+.. _pr-approval:
+
+Approval
+--------
 As a guiding principle, we require two `approvals`_ from core developers (those
 with commit rights) before merging a pull request. This two-pairs-of-eyes
 strategy shall ensure a consistent project direction and prevent accidental
@@ -229,18 +247,22 @@ Some explicit rules following from this:
     A core dev should only champion one PR at a time and we should try to keep
     the flow of championed PRs reasonable.
 
-After giving the last required approval, the author of the approval should
-merge the PR. PR authors should not self-merge except for when another reviewer
-explicitly allows it (e.g., "Approve modulo CI passing, may self merge when
-green", or "Take or leave the comments. You may self merge".).
-
 .. _pr-automated-tests:
 
 Automated tests
 ---------------
 Before being merged, a PR should pass the :ref:`automated-tests`. If you are
 unsure why a test is failing, ask on the PR or in our :ref:`communication-channels`
 
+.. _pr-merging:
+
+Merging
+-------
+After giving the last required :ref:`approval <pr-approval>`, the author of the
+approval should merge the PR. PR authors should not self-merge except for when
+another reviewer explicitly allows it (e.g., "Approve modulo CI passing, may
+self-merge when green", or "Take or leave the comments. You may self merge".).
+
 .. _pr-squashing:
 
 Number of commits and squashing
@@ -252,19 +274,6 @@ Number of commits and squashing
   about it is to eliminate binary files (ex multiple test image
   re-generations) and to remove upstream merges.
 
-* Do not let perfect be the enemy of the good, particularly for
-  documentation or example PRs.  If you find yourself making many
-  small suggestions, either open a PR against the original branch,
-  push changes to the contributor branch, or merge the PR and then
-  open a new PR against upstream.
-
-* If you push to a contributor branch leave a comment explaining what
-  you did, ex "I took the liberty of pushing a small clean-up PR to
-  your branch, thanks for your work.".  If you are going to make
-  substantial changes to the code or intent of the PR please check
-  with the contributor first.
-
-
 .. _branches_and_backports:
 
 Branches and backports

doc/release/next_whats_new/pyplot-register-figure.rst

@@ -0,0 +1,63 @@
+Figures can be attached to and removed from pyplot
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Figures can now be attached to and removed from management through pyplot, which in
+the background also means a less strict coupling to backends.
+
+In particular, standalone figures (created with the `.Figure` constructor) can now be
+registered with the `.pyplot` module by calling ``plt.figure(fig)``. This allows to
+show them with ``plt.show()`` as you would do with any figure created with pyplot
+factory methods such as ``plt.figure()`` or ``plt.subplots()``.
+
+When closing a shown figure window, the related figure is reset to the standalone
+state, i.e. it's not visible to pyplot anymore, but if you still hold a reference
+to it, you can continue to work with it (e.g. do ``fig.savefig()``, or re-add it
+to pyplot with ``plt.figure(fig)`` and then show it again).
+
+The following is now possible - though the example is exaggerated to show what's
+possible. In practice, you'll stick with much simpler versions for better
+consistency ::
+
+    import matplotlib.pyplot as plt
+    from matplotlib.figure import Figure
+
+    # Create a standalone figure
+    fig = Figure()
+    ax = fig.add_subplot()
+    ax.plot([1, 2, 3], [4, 5, 6])
+
+    # Register it with pyplot
+    plt.figure(fig)
+
+    # Modify the figure through pyplot
+    plt.xlabel("x label")
+
+    # Show the figure
+    plt.show()
+
+    # Close the figure window through the GUI
+
+    # Continue to work on the figure
+    fig.savefig("my_figure.png")
+    ax.set_ylabel("y label")
+
+    # Re-register the figure and show it again
+    plt.figure(fig)
+    plt.show()
+
+Technical detail: Standalone figures use `.FigureCanvasBase` as canvas. This is
+replaced by a backend-dependent subclass when registering with pyplot, and is
+reset to `.FigureCanvasBase` when the figure is closed. `.Figure.savefig` uses
+the current canvas to save the figure (if possible). Since `.FigureCanvasBase`
+can not render the figure, when saving the figure, it will fallback to a suitable
+canvas subclass, e.g. `.FigureCanvasAgg` for raster outputs such as png.
+Any Agg-based backend will create the same file output. However, there may be
+slight differences for non-Agg backends; e.g. if you use "GTK4Cairo" as
+interactive backend, ``fig.savefig("file.png")`` may create a slightly different
+image depending on whether the figure is registered with pyplot or not. In
+general, you should not store a reference to the canvas, but rather always
+obtain it from the figure with ``fig.canvas``. This will return the current
+canvas, which is either the original `.FigureCanvasBase` or a backend-dependent
+subclass, depending on whether the figure is registered with pyplot or not.
+Additionally, the swapping of the canvas currently does not play well with
+blitting of matplotlib widgets; in such cases either deactivate blitting or do not
+continue to use the figure (e.g. saving it after closing the window).

doc/release/next_whats_new/scroll_to_zoom.rst

@@ -0,0 +1,8 @@
+Zooming using mouse wheel
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Ctrl+MouseWheel`` can be used to zoom in the plot windows.
+
+The zoom focusses on the mouse pointer, and keeps the aspect ratio of the axes.
+
+Zooming is currently only supported on rectilinear Axes.

galleries/users_explain/text/fonts.py

@@ -27,28 +27,24 @@
 Matplotlib supports three font specifications (in addition to pdf 'core fonts',
 which are explained later in the guide):
 
-.. table:: Type of Fonts
-
-  +--------------------------+----------------------------+----------------------------+
-  | Type 1 (PDF with usetex) | Type 3 (PDF/PS)            | TrueType (PDF)             |
-  +==========================+============================+============================+
-  | One of the oldest types, | Similar to Type 1 in       | Newer than previous types, |
-  | introduced by Adobe      | terms of introduction      | used commonly today,       |
-  |                          |                            | introduced by Apple        |
-  +--------------------------+----------------------------+----------------------------+
-  | Restricted subset of     | Full PostScript language,  | Includes a virtual machine |
-  | PostScript, charstrings  | allows embedding arbitrary | that can execute code!     |
-  | are in bytecode          | code (in theory, even      |                            |
-  |                          | render fractals when       |                            |
-  |                          | rasterizing!)              |                            |
-  +--------------------------+----------------------------+----------------------------+
-  | Supports font            | Does not support font      | Supports font hinting      |
-  | hinting                  | hinting                    | (virtual machine processes |
-  |                          |                            | the "hints")               |
-  +--------------------------+----------------------------+----------------------------+
-  | Subsetted by code in     | Subsetted via external module                           |
-  | `matplotlib._type1font`  | `fontTools <https://github.com/fonttools/fonttools>`__  |
-  +--------------------------+----------------------------+----------------------------+
+.. table:: Types of Fonts
+
+  +--------------------------+----------------------------+-------------------------------+
+  | Type 1 (PDF with usetex) | Type 3 (PDF/PS)            | TrueType (PDF) / Type 42 (PS) |
+  +==========================+============================+===============================+
+  | Old font types introduced by Adobe.                   | Newer font type introduced by |
+  |                                                       | Apple; commonly used today.   |
+  +--------------------------+----------------------------+-------------------------------+
+  | Restricted subset of     | Full PostScript language,  | Includes a virtual machine    |
+  | PostScript, charstrings  | allows embedding arbitrary | that can execute code.        |
+  | are in bytecode.         | code.                      |                               |
+  +--------------------------+----------------------------+-------------------------------+
+  | Supports font hinting.   | Does not support font      | Supports font hinting,        |
+  |                          | hinting.                   | through the virtual machine.  |
+  +--------------------------+----------------------------+-------------------------------+
+  | Subsetted by code in     | Subsetted via external module                              |
+  | `matplotlib._type1font`. | `fontTools <https://github.com/fonttools/fonttools>`__.    |
+  +--------------------------+----------------------------+-------------------------------+
 
 .. note::
 
@@ -59,23 +55,9 @@
 
    __ https://helpx.adobe.com/fonts/kb/postscript-type-1-fonts-end-of-support.html
 
-Other font specifications which Matplotlib supports:
-
-- Type 42 fonts (PS):
-
-  - PostScript wrapper around TrueType fonts
-  - 42 is the `Answer to Life, the Universe, and Everything!
-    <https://en.wikipedia.org/wiki/Answer_to_Life,_the_Universe,_and_Everything>`_
-  - Matplotlib uses the external library
-    `fontTools <https://github.com/fonttools/fonttools>`__ to subset these types of
-    fonts
-
-- OpenType fonts:
-
-  - OpenType is a new standard for digital type fonts, developed jointly by
-    Adobe and Microsoft
-  - Generally contain a much larger character set!
-  - Limited support with Matplotlib
+Matplotlib also provides limited support for OpenType fonts, a newer standard
+developed jointly by Adobe and Microsoft; such fonts generally contain a much
+larger character set.
 
 Font subsetting
 ^^^^^^^^^^^^^^^
@@ -201,4 +183,4 @@
 
 A majority of this work was done by Aitik Gupta supported by Google Summer of
 Code 2021.
-"""
+"""  # noqa: E501

lib/matplotlib/_pylab_helpers.py

@@ -53,6 +53,8 @@ def destroy(cls, num):
         two managers share the same number.
         """
         if all(hasattr(num, attr) for attr in ["num", "destroy"]):
+            # num is a manager-like instance (not necessarily a
+            # FigureManagerBase subclass)
             manager = num
             if cls.figs.get(manager.num) is manager:
                 cls.figs.pop(manager.num)