Merge main back into text-overhaul branch

Author: QuLogic

.appveyor.yml

@@ -114,7 +114,7 @@ on_finish:
   - codecov -e PYTHON_VERSION PLATFORM -n "%PYTHON_VERSION% Windows"
 
 on_failure:
-  # Generate a html for visual tests
+  # Generate an html for visual tests
   - python tools/visualize_tests.py --no-browser
   - echo zipping images after a failure...
   - 7z a result_images.zip result_images\ | grep -v "Compressing"

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7  # v4.31.9
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89  # v4.31.10
         with:
           languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
           pip install --user -v .
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7  # v4.31.9
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89  # v4.31.10

.github/workflows/cygwin.yml

@@ -140,21 +140,21 @@ jobs:
         # FreeType build fails with bash, succeeds with dash
 
       - name: Cache pip
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: C:\cygwin\home\runneradmin\.cache\pip
           key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
           restore-keys: ${{ matrix.os }}-py3.${{ matrix.python-minor-version }}-pip-
 
       - name: Cache ccache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: C:\cygwin\home\runneradmin\.ccache
           key: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-${{ hashFiles('src/*') }}
           restore-keys: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-
 
       - name: Cache Matplotlib
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             C:\cygwin\home\runneradmin\.cache\matplotlib

.github/workflows/tests.yml

@@ -203,31 +203,31 @@ jobs:
           esac
 
       - name: Cache pip
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
           key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
           restore-keys: |
             ${{ matrix.os }}-py${{ matrix.python-version }}-pip-
       - name: Cache pip
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         if: startsWith(runner.os, 'macOS')
         with:
           path: ~/Library/Caches/pip
           key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
           restore-keys: |
             ${{ matrix.os }}-py${{ matrix.python-version }}-pip-
       - name: Cache ccache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             ~/.ccache
           key: ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
           restore-keys: |
             ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-
       - name: Cache Matplotlib
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb  # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7  # v5.0.2
         with:
           path: |
             ~/.cache/matplotlib

.mailmap

@@ -11,6 +11,8 @@ Alon Hershenhorn <hershen@gmail.com>
 
 Alvaro Sanchez <sanchezgnzlz.alvaro@gmail.com>
 
+Andreas C Mueller <andreasmuellerml@gmail.com> Andreas Mueller <t3kcit@gmail.com>
+
 Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
 
 anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
@@ -32,6 +34,8 @@ Carsten Schelp <carstenschelp@mp.nl>
 
 Casper van der Wel <caspervdw@gmail.com>
 
+CharlesHe16 <c@harl.es>
+
 Chris Holdgraf <choldgraf@gmail.com>
 
 Cho Yin Yong <choyiny@users.noreply.github.com>
@@ -57,6 +61,8 @@ David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
 
 Devashish Deshpande <ashu.9412@gmail.com>
 
+Diego Leal Petrola <diegopetrola@gmail.com>
+
 Dietmar Schwertberger <github@schwertberger.de>
 
 Dora Fraeman Caswell <dorafraeman@gmail.com>
@@ -84,16 +90,26 @@ Hajoon Choi <hajoon.choi@mail.utoronto.ca>
 
 hannah <story645@gmail.com>
 
+Hannes Breytenbach <hannes@saao.ac.za>
+
 Hans Moritz Günther <moritz.guenther@gmx.de>
 
 Harshal Prakash Patankar <pharshalp@gmail.com>
 
 Harshit Patni <patniharshit@gmail.com>
 
+Harutaka Kawamura <hkawamura0130@gmail.com>
+
+Hood Chatham <roberthoodchatham@gmail.com> Hood <hood@mit.edu>
+
+Ian Hunt-Isaak <ianhuntisaak@gmail.com>
+
 ImportanceOfBeingErnest <elch.rz@ruetz-online.de>
 
 J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>
 
+Jakub Klus <48711526+deep-jkl@users.noreply.github.com>
+
 Jack Kelly <jack.kelly@imperial.ac.uk> <daniel.kelly10@imperial.ac.uk>
 Jack Kelly <jack.kelly@imperial.ac.uk> <jack-list@xlk.org.uk>
 
@@ -105,19 +121,27 @@ Jake Vanderplas <jakevdp@gmail.com> <vanderplas@astro.washington.edu>
 
 James R. Evans <jrevans1@earthlink.net>
 
+Jan-Hendrik Müller <44469195+kolibril13@users.noreply.github.com>
+
 Jeff Lutgen <jlutgen@gmail.com> <jlutgen@users.noreply.github.com>
 
 Jeffrey Bingham <bingjeff@gmail.com>
 
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> <jens.nielsen@ucl.ac.uk>
 
+Jerome F. Villegas <jeromefvillegas@gmail.com>
+
 Joel Frederico <458871+joelfrederico@users.noreply.github.com>
 
+Johan von Forstner <johan.forstner@gmail.com>
+
 John Hunter <jdh2358@gmail.com>
 
 Jorrit Wronski <jowr@mek.dtu.dk>
 
+Jose Manuel Martí <jse.mnl@gmail.com>
+
 Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Mad Physicist <madphysicist@users.noreply.github.com>
 Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>
 
@@ -149,11 +173,15 @@ Leon Yin <hello.leonyin@gmail.com>
 
 Lion Krischer <lion.krischer@gmail.com> <krischer@geophysik.uni-muenchen.de>
 
+luz paz <luzpaz@users.noreply.github.com>
+
 Manan Kevadiya <kevadiyamanan@gmail.com>
 Manan Kevadiya <kevadiyamanan@gmail.com> <43081866+manan2501@users.noreply.github.com>
 
 Manuel Nuno Melo <manuel.nuno.melo@gmail.com>
 
+Marat Kopytjuk <kopytjuk@gmail.com>
+
 Marco Gorelli <m.e.gorelli@gmail.com>
 Marco Gorelli <m.e.gorelli@gmail.com> <33491632+MarcoGorelli@users.noreply.github.com>
 
@@ -215,19 +243,27 @@ Paul Ivanov <pivanov314@gmail.com> <pivanov5@bloomberg.net>
 
 Per Parker <wisalam@live.com>
 
+Péter Leéh <leeh123peter@gmail.com>
+
 Peter Würtz <pwuertz@gmail.com>
 Peter Würtz <pwuertz@gmail.com> <pwuertz@googlemail.com>
 
 Phil Elson <pelson.pub@gmail.com>
 Phil Elson <pelson.pub@gmail.com> <philipelson@hotmail.com>
 Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>
 
+Philipp Nagel <phil.nagel@bolton-menk.com>
+
 productivememberofsociety666 <productivememberofsociety666@sol.fr.am> none <none@example.net>
 
 Rishikesh <rishikksh20@gmail.com>
 
+Ruth Nainggolan <nainggolan.ruthg@gmail.com> Ruth G. N <32371319+ruthgn@users.noreply.github.com>
+
 RyanPan <ryanbelt1993129@hotmail.com>
 
+Richard Sheridan <richard.sheridan@gmail.com>
+
 Samesh Lakhotia <samesh.lakhotia@gmail.com>
 Samesh Lakhotia <43701530+sameshl@users.noreply.github.com> <samesh.lakhotia@gmail.com>'
 
@@ -236,6 +272,8 @@ Scott Lasley <selasley@me.com>
 Sebastian Raschka <mail@sebastianraschka.com>
 Sebastian Raschka <mail@sebastianraschka.com> <se.raschka@me.com>
 
+ShawnChen1996 <shawnchen1996@outlook.com>
+
 Sidharth Bansal <bansal.sidharth2996@gmail.com>
 Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> <bansal.sidharth2996@gmail.com>
 
@@ -257,6 +295,7 @@ Taras Kuzyo <kuzyo.taras@gmail.com>
 
 Terence Honles <terence@honles.com>
 
+Thomas A Caswell <tcaswell@gmail.com>
 Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
 Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@uchicago.edu>
 Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <“tcaswell@gmail.com”>

doc/api/next_api_changes/deprecations/31023-AL.rst

@@ -0,0 +1,4 @@
+``cbook.normalize_kwargs`` only supports passing artists and artist classes as second argument
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for directly passing an alias mapping or None as second argument to
+`.cbook.normalize_kwargs` has been deprecated.

doc/api/widgets_api.rst

@@ -27,6 +27,7 @@ Widget classes
    Cursor
    MultiCursor
    Button
+   _Buttons
    CheckButtons
    RadioButtons
    SliderBase

doc/conf.py

@@ -132,8 +132,9 @@ def _parse_skip_subdirs_file():
     'sphinxext.math_symbol_table',
     'sphinxext.missing_references',
     'sphinxext.mock_gui_toolkits',
-    'sphinxext.skip_deprecated',
+    'sphinxext.rcparams',
     'sphinxext.redirect_from',
+    'sphinxext.skip_deprecated',
     'sphinx_copybutton',
     'sphinx_design',
     'sphinx_tags',
@@ -194,14 +195,16 @@ def _check_dependencies():
     gallery_order_sectionorder = 'sphinxext.gallery_order.sectionorder'
     gallery_order_subsectionorder = 'sphinxext.gallery_order.subsectionorder'
     clear_basic_units = 'sphinxext.util.clear_basic_units'
+    patch_header = 'sphinxext.util.patch_header'
     matplotlib_reduced_latex_scraper = 'sphinxext.util.matplotlib_reduced_latex_scraper'
 else:
     # gallery_order.py from the sphinxext folder provides the classes that
     # allow custom ordering of sections and subsections of the gallery
     from sphinxext.gallery_order import (
         sectionorder as gallery_order_sectionorder,
         subsectionorder as gallery_order_subsectionorder)
-    from sphinxext.util import clear_basic_units, matplotlib_reduced_latex_scraper
+    from sphinxext.util import (clear_basic_units, matplotlib_reduced_latex_scraper,
+                                patch_header)
 
 if parse_version(sphinx_gallery.__version__) >= parse_version('0.17.0'):
     sg_matplotlib_animations = (True, 'mp4')
@@ -305,7 +308,7 @@ def autodoc_process_bases(app, name, obj, options, bases):
     'reference_url': {'matplotlib': None, 'mpl_toolkits': None},
     'prefer_full_module': {r'mpl_toolkits\.'},
     'remove_config_comments': True,
-    'reset_modules': ('matplotlib', clear_basic_units, 'sphinxext.util.patch_header'),
+    'reset_modules': ('matplotlib', clear_basic_units, patch_header),
     'subsection_order': gallery_order_sectionorder,
     'thumbnail_size': (320, 224),
     'within_subsection_order': gallery_order_subsectionorder,
@@ -899,3 +902,4 @@ def setup(app):
     if sphinx.version_info[:2] < (7, 1):
         app.connect('html-page-context', add_html_cache_busting, priority=1000)
     generate_ScalarMappable_docs()
+    app.config.autodoc_use_legacy_class_based = True