Merge branch 'main' into text-overhaul

Author: QuLogic

.appveyor.yml

@@ -17,7 +17,7 @@ skip_commits:
 
 clone_depth: 50
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 environment:
 

.github/workflows/cibuildwheel.yml

@@ -140,15 +140,27 @@ jobs:
           name: cibw-sdist
           path: dist/
 
+      - name: Build wheels for CPython 3.14
+        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        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@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
         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
@@ -167,7 +179,6 @@ jobs:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
-
       - name: Build wheels for PyPy
         uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
         with:
@@ -176,8 +187,6 @@ jobs:
           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'
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858  # v3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
         with:
           languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858  # v3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2

.github/workflows/tests.yml

@@ -365,13 +365,15 @@ jobs:
         run: |
           function remove_files() {
               local extension=$1
-              find ./result_images -type f -name "*-expected*.$extension" | while read file; do
+              find ./result_images -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
+                  elif [[ $file == *"-expected_gif"* ]]; then
+                      base=${file%-expected_gif.$extension}_gif
                   else
                       base=${file%-expected.$extension}
                   fi
@@ -388,7 +390,7 @@ jobs:
               done
           }
 
-          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps";
+          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps"; remove_files "gif";
 
           if [ "$(find ./result_images -mindepth 1 -type d)" ]; then
               find ./result_images/* -type d -empty -delete

doc/api/colors_api.rst

@@ -21,6 +21,7 @@ Color norms
    :toctree: _as_gen/
    :template: autosummary.rst
 
+   Norm
    Normalize
    NoNorm
    AsinhNorm

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``.

doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst

@@ -282,7 +282,7 @@ Miscellaneous deprecations
 - The *format* parameter of ``dviread.find_tex_file`` is deprecated (with no
   replacement).
 - ``FancyArrowPatch.get_path_in_displaycoord`` and
-  ``ConnectionPath.get_path_in_displaycoord`` are deprecated. The path in
+  ``ConnectionPatch.get_path_in_displaycoord`` are deprecated. The path in
   display coordinates can still be obtained, as for other patches, using
   ``patch.get_transform().transform_path(patch.get_path())``.
 - The ``font_manager.win32InstalledFonts`` and

doc/api/prev_api_changes/api_changes_3.7.0/removals.rst

@@ -323,7 +323,7 @@ Miscellaneous removals
 - The *format* parameter of ``dviread.find_tex_file`` is removed (with no
   replacement).
 - ``FancyArrowPatch.get_path_in_displaycoord`` and
-  ``ConnectionPath.get_path_in_displaycoord`` are removed. The path in
+  ``ConnectionPatch.get_path_in_displaycoord`` are removed. The path in
   display coordinates can still be obtained, as for other patches, using
   ``patch.get_transform().transform_path(patch.get_path())``.
 - The ``font_manager.win32InstalledFonts`` and

doc/devel/tag_guidelines.rst

@@ -61,7 +61,7 @@ Proposing new tags
 1. Review existing tag list, looking out for similar entries (i.e. ``axes`` and ``axis``).
 2. If a relevant tag or subcategory does not yet exist, propose it. Each tag is two
    parts: ``subcategory: tag``. Tags should be one or two words.
-3. New tags should be be added when they are relevant to existing gallery entries too.
+3. New tags should be added when they are relevant to existing gallery entries too.
    Avoid tags that will link to only a single gallery entry.
 4. Tags can recreate other forms of organization.
 

doc/project/history.rst

@@ -157,7 +157,7 @@ Matplotlib logo (2008 - 2015).
 
 
    def add_math_background():
-       ax = fig.add_axes([0., 0., 1., 1.])
+       ax = fig.add_axes((0., 0., 1., 1.))
 
        text = []
        text.append(
@@ -187,7 +187,7 @@ Matplotlib logo (2008 - 2015).
 
 
    def add_polar_bar():
-       ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], projection='polar')
+       ax = fig.add_axes((0.025, 0.075, 0.2, 0.85), projection='polar')
 
        ax.patch.set_alpha(axalpha)
        ax.set_axisbelow(True)

doc/users/faq.rst

@@ -281,8 +281,23 @@ locators as desired because the two axes are independent.
 Generate images without having a window appear
 ----------------------------------------------
 
-Simply do not call `~matplotlib.pyplot.show`, and directly save the figure to
-the desired format::
+The recommended approach since matplotlib 3.1 is to explicitly create a Figure
+instance::
+
+    from matplotlib.figure import Figure
+    fig = Figure()
+    ax = fig.subplots()
+    ax.plot([1, 2, 3])
+    fig.savefig('myfig.png')
+
+This prevents any interaction with GUI frameworks and the window manager.
+
+It's alternatively still possible to use the pyplot interface. Instead of
+calling `matplotlib.pyplot.show`, call `matplotlib.pyplot.savefig`.
+
+Additionally, you must ensure to close the figure after saving it. Not
+closing the figure is a memory leak, because pyplot keeps references
+to all not-yet-shown figures::
 
     import matplotlib.pyplot as plt
     plt.plot([1, 2, 3])

doc/users/next_whats_new/new_rcparams_grid_options.rst

@@ -0,0 +1,33 @@
+Separate styling options for major/minor grid line in rcParams
+--------------------------------------------------------------
+
+Using :rc:`grid.major.*` or :rc:`grid.minor.*` will overwrite the value in
+:rc:`grid.*` for the major and minor gridlines, respectively.
+
+.. plot::
+    :include-source: true
+    :alt: Modifying the gridlines using the new options `rcParams`
+
+    import matplotlib as mpl
+    import matplotlib.pyplot as plt
+
+
+    # Set visibility for major and minor gridlines
+    mpl.rcParams["axes.grid"] = True
+    mpl.rcParams["ytick.minor.visible"] = True
+    mpl.rcParams["xtick.minor.visible"] = True
+    mpl.rcParams["axes.grid.which"] = "both"
+
+    # Using old values to set both major and minor properties
+    mpl.rcParams["grid.color"] = "red"
+    mpl.rcParams["grid.linewidth"] = 1
+
+    # Overwrite some values for major and minor separately
+    mpl.rcParams["grid.major.color"] = "black"
+    mpl.rcParams["grid.major.linewidth"] = 2
+    mpl.rcParams["grid.minor.linestyle"] = ":"
+    mpl.rcParams["grid.minor.alpha"] = 0.6
+
+    plt.plot([0, 1], [0, 1])
+
+    plt.show()

doc/users/prev_whats_new/dflt_style_changes.rst

@@ -1005,7 +1005,7 @@ a cleaner separation between subplots.
 
            ax = fig.add_subplot(2, 2, j)
            ax.hist(np.random.beta(0.5, 0.5, 10000), 25, density=True)
-           ax.set_xlim([0, 1])
+           ax.set_xlim(0, 1)
            ax.set_title(title)
 
            ax = fig.add_subplot(2, 2, j + 2)

doc/users/prev_whats_new/whats_new_3.5.0.rst

@@ -274,9 +274,9 @@ of the text inside the Axes of the `.TextBox` widget.
 
     fig = plt.figure(figsize=(4, 3))
     for i, alignment in enumerate(['left', 'center', 'right']):
-            box_input = fig.add_axes([0.1, 0.7 - i*0.3, 0.8, 0.2])
-            text_box = TextBox(ax=box_input, initial=f'{alignment} alignment',
-                               label='', textalignment=alignment)
+        box_input = fig.add_axes((0.1, 0.7 - i*0.3, 0.8, 0.2))
+        text_box = TextBox(ax=box_input, initial=f'{alignment} alignment',
+                           label='', textalignment=alignment)
 
 Simplifying the font setting for usetex mode
 --------------------------------------------
@@ -375,9 +375,9 @@ attribute.
         points = ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10,
                             label='zorder=10')
 
-        ax.set_xlim((0, 5))
-        ax.set_ylim((0, 5))
-        ax.set_zlim((0, 2.5))
+        ax.set_xlim(0, 5)
+        ax.set_ylim(0, 5)
+        ax.set_zlim(0, 2.5)
 
     plane = mpatches.Patch(facecolor='white', edgecolor='black',
                            label='zorder=1')
@@ -485,7 +485,7 @@ new styling parameters for the added handles.
     ax = ax_old
     valmin = 0
     valinit = 0.5
-    ax.set_xlim([0, 1])
+    ax.set_xlim(0, 1)
     ax_old.axvspan(valmin, valinit, 0, 1)
     ax.axvline(valinit, 0, 1, color="r", lw=1)
     ax.set_xticks([])

doc/users/prev_whats_new/whats_new_3.8.0.rst

@@ -359,7 +359,7 @@ The following delimiter names have been supported earlier, but can now be sized
 * ``\leftparen`` and ``\rightparen``
 
 There are really no obvious advantages in using these.
-Instead, they are are added for completeness.
+Instead, they are added for completeness.
 
 ``mathtext`` documentation improvements
 ---------------------------------------
@@ -513,7 +513,7 @@ Plot Directive now can make responsive images with "srcset"
 
 The plot sphinx directive (``matplotlib.sphinxext.plot_directive``, invoked in
 rst as ``.. plot::``) can be configured to automatically make higher res
-figures and add these to the the built html docs.  In ``conf.py``::
+figures and add these to the built html docs.  In ``conf.py``::
 
     extensions = [
     ...

galleries/examples/animation/rain.py

@@ -22,7 +22,7 @@
 
 # Create new Figure and an Axes which fills it.
 fig = plt.figure(figsize=(7, 7))
-ax = fig.add_axes([0, 0, 1, 1], frameon=False)
+ax = fig.add_axes((0, 0, 1, 1), frameon=False)
 ax.set_xlim(0, 1), ax.set_xticks([])
 ax.set_ylim(0, 1), ax.set_yticks([])
 

galleries/examples/animation/simple_scatter.py

@@ -11,7 +11,7 @@
 import matplotlib.animation as animation
 
 fig, ax = plt.subplots()
-ax.set_xlim([0, 10])
+ax.set_xlim(0, 10)
 
 scat = ax.scatter(1, 0)
 x = np.linspace(0, 10)

galleries/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py

@@ -10,7 +10,7 @@
 from mpl_toolkits.axes_grid1.axes_divider import make_axes_area_auto_adjustable
 
 fig = plt.figure()
-ax = fig.add_axes([0, 0, 1, 1])
+ax = fig.add_axes((0, 0, 1, 1))
 
 ax.set_yticks([0.5], labels=["very long label"])
 
@@ -19,8 +19,8 @@
 # %%
 
 fig = plt.figure()
-ax1 = fig.add_axes([0, 0, 1, 0.5])
-ax2 = fig.add_axes([0, 0.5, 1, 0.5])
+ax1 = fig.add_axes((0, 0, 1, 0.5))
+ax2 = fig.add_axes((0, 0.5, 1, 0.5))
 
 ax1.set_yticks([0.5], labels=["very long label"])
 ax1.set_ylabel("Y label")
@@ -33,7 +33,7 @@
 # %%
 
 fig = plt.figure()
-ax1 = fig.add_axes([0, 0, 1, 1])
+ax1 = fig.add_axes((0, 0, 1, 1))
 divider = make_axes_locatable(ax1)
 
 ax2 = divider.append_axes("right", "100%", pad=0.3, sharey=ax1)

galleries/examples/axisartist/demo_parasite_axes.py

@@ -24,7 +24,7 @@
 
 fig = plt.figure()
 
-host = fig.add_axes([0.15, 0.1, 0.65, 0.8], axes_class=HostAxes)
+host = fig.add_axes((0.15, 0.1, 0.65, 0.8), axes_class=HostAxes)
 par1 = host.get_aux_axes(viewlim_mode=None, sharex=host)
 par2 = host.get_aux_axes(viewlim_mode=None, sharex=host)
 

galleries/examples/event_handling/poly_editor.py

@@ -203,6 +203,6 @@ def on_mouse_move(self, event):
     p = PolygonInteractor(ax, poly)
 
     ax.set_title('Click and drag a point to move it')
-    ax.set_xlim((-2, 2))
-    ax.set_ylim((-2, 2))
+    ax.set_xlim(-2, 2)
+    ax.set_ylim(-2, 2)
     plt.show()

galleries/examples/event_handling/pong_sgskip.py

@@ -134,9 +134,9 @@ def __init__(self, ax):
         # create the initial line
         self.ax = ax
         ax.xaxis.set_visible(False)
-        ax.set_xlim([0, 7])
+        ax.set_xlim(0, 7)
         ax.yaxis.set_visible(False)
-        ax.set_ylim([-1, 1])
+        ax.set_ylim(-1, 1)
         pad_a_x = 0
         pad_b_x = .50
         pad_a_y = pad_b_y = .30

galleries/examples/images_contours_and_fields/barcode_demo.py

@@ -30,7 +30,7 @@
 dpi = 100
 
 fig = plt.figure(figsize=(len(code) * pixel_per_bar / dpi, 2), dpi=dpi)
-ax = fig.add_axes([0, 0, 1, 1])  # span the whole figure
+ax = fig.add_axes((0, 0, 1, 1))  # span the whole figure
 ax.set_axis_off()
 ax.imshow(code.reshape(1, -1), cmap='binary', aspect='auto',
           interpolation='nearest')

galleries/examples/images_contours_and_fields/image_antialiasing.py

@@ -245,7 +245,7 @@
 # may serve a 100x100 version of the image, which will be downsampled.)
 
 fig = plt.figure(figsize=(2, 2))
-ax = fig.add_axes([0, 0, 1, 1])
+ax = fig.add_axes((0, 0, 1, 1))
 ax.imshow(aa[:400, :400], cmap='RdBu_r', interpolation='nearest')
 plt.show()
 # %%

galleries/examples/images_contours_and_fields/image_exact_placement.py

@@ -134,13 +134,13 @@ def annotate_rect(ax):
 fig = plt.figure(figsize=(fig_width / dpi, fig_height / dpi), facecolor='aliceblue')
 
 # the position posA must be normalized by the figure width and height:
-ax = fig.add_axes([posA[0] / fig_width, posA[1] / fig_height,
-                   posA[2] / fig_width, posA[3] / fig_height])
+ax = fig.add_axes((posA[0] / fig_width, posA[1] / fig_height,
+                   posA[2] / fig_width, posA[3] / fig_height))
 ax.imshow(A, vmin=-1, vmax=1)
 annotate_rect(ax)
 
-ax = fig.add_axes([posB[0] / fig_width, posB[1] / fig_height,
-                   posB[2] / fig_width, posB[3] / fig_height])
+ax = fig.add_axes((posB[0] / fig_width, posB[1] / fig_height,
+                   posB[2] / fig_width, posB[3] / fig_height))
 ax.imshow(B, vmin=-1, vmax=1)
 plt.show()
 # %%