Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ccb621c

Browse files
QuLogicQuLogic
authored
Merge main back into text-overhaul branch
2 parents 838e005 + f08ba30 commit ccb621c

38 files changed

Lines changed: 953 additions & 2159 deletions

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ on_finish:
114114
- codecov -e PYTHON_VERSION PLATFORM -n "%PYTHON_VERSION% Windows"
115115

116116
on_failure:
117-
# Generate a html for visual tests
117+
# Generate an html for visual tests
118118
- python tools/visualize_tests.py --no-browser
119119
- echo zipping images after a failure...
120120
- 7z a result_images.zip result_images\ | grep -v "Compressing"

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
35+
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
3636
with:
3737
languages: ${{ matrix.language }}
3838

@@ -43,4 +43,4 @@ jobs:
4343
pip install --user -v .
4444
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
46+
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10

‎.github/workflows/cygwin.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,21 @@ jobs:
140140
# FreeType build fails with bash, succeeds with dash
141141

142142
- name: Cache pip
143-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
143+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
144144
with:
145145
path: C:\cygwin\home\runneradmin\.cache\pip
146146
key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
147147
restore-keys: ${{ matrix.os }}-py3.${{ matrix.python-minor-version }}-pip-
148148

149149
- name: Cache ccache
150-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
150+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
151151
with:
152152
path: C:\cygwin\home\runneradmin\.ccache
153153
key: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-${{ hashFiles('src/*') }}
154154
restore-keys: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-
155155

156156
- name: Cache Matplotlib
157-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
157+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
158158
with:
159159
path: |
160160
C:\cygwin\home\runneradmin\.cache\matplotlib

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,31 +203,31 @@ jobs:
203203
esac
204204
205205
- name: Cache pip
206-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
206+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
207207
if: startsWith(runner.os, 'Linux')
208208
with:
209209
path: ~/.cache/pip
210210
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
211211
restore-keys: |
212212
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
213213
- name: Cache pip
214-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
214+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
215215
if: startsWith(runner.os, 'macOS')
216216
with:
217217
path: ~/Library/Caches/pip
218218
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
219219
restore-keys: |
220220
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
221221
- name: Cache ccache
222-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
222+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
223223
with:
224224
path: |
225225
~/.ccache
226226
key: ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
227227
restore-keys: |
228228
${{ matrix.os }}-py${{ matrix.python-version }}-ccache-
229229
- name: Cache Matplotlib
230-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
230+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
231231
with:
232232
path: |
233233
~/.cache/matplotlib

‎.mailmap‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Alon Hershenhorn <[email protected]>
1111

1212
Alvaro Sanchez <[email protected]>
1313

14+
Andreas C Mueller <[email protected]> Andreas Mueller <[email protected]>
15+
1416
Andrew Dawson <[email protected]> <[email protected]>
1517

1618
anykraus <[email protected]> <[email protected]>
@@ -32,6 +34,8 @@ Carsten Schelp <[email protected]>
3234

3335
Casper van der Wel <[email protected]>
3436

37+
CharlesHe16 <[email protected]>
38+
3539
Chris Holdgraf <[email protected]>
3640

3741
Cho Yin Yong <[email protected]>
@@ -57,6 +61,8 @@ David Kua <[email protected]> <[email protected]>
5761

5862
Devashish Deshpande <[email protected]>
5963

64+
Diego Leal Petrola <[email protected]>
65+
6066
Dietmar Schwertberger <[email protected]>
6167

6268
Dora Fraeman Caswell <[email protected]>
@@ -84,16 +90,26 @@ Hajoon Choi <[email protected]>
8490

8591
hannah <[email protected]>
8692

93+
Hannes Breytenbach <[email protected]>
94+
8795
Hans Moritz Günther <[email protected]>
8896

8997
Harshal Prakash Patankar <[email protected]>
9098

9199
Harshit Patni <[email protected]>
92100

101+
Harutaka Kawamura <[email protected]>
102+
103+
Hood Chatham <[email protected]> Hood <[email protected]>
104+
105+
Ian Hunt-Isaak <[email protected]>
106+
93107
ImportanceOfBeingErnest <[email protected]>
94108

95109
J. Goutin <[email protected]> JGoutin <[email protected]>
96110

111+
Jakub Klus <[email protected]>
112+
97113
Jack Kelly <[email protected]> <[email protected]>
98114
Jack Kelly <[email protected]> <[email protected]>
99115

@@ -105,19 +121,27 @@ Jake Vanderplas <[email protected]> <[email protected]>
105121

106122
James R. Evans <[email protected]>
107123

124+
Jan-Hendrik Müller <[email protected]>
125+
108126
Jeff Lutgen <[email protected]> <[email protected]>
109127

110128
Jeffrey Bingham <[email protected]>
111129

112130
Jens Hedegaard Nielsen <[email protected]>
113131
Jens Hedegaard Nielsen <[email protected]> <[email protected]>
114132

133+
Jerome F. Villegas <[email protected]>
134+
115135
Joel Frederico <[email protected]>
116136

137+
Johan von Forstner <[email protected]>
138+
117139
John Hunter <[email protected]>
118140

119141
Jorrit Wronski <[email protected]>
120142

143+
Jose Manuel Martí <[email protected]>
144+
121145
Joseph Fox-Rabinovitz <[email protected]> Mad Physicist <[email protected]>
122146
Joseph Fox-Rabinovitz <[email protected]> Joseph Fox-Rabinovitz <[email protected]>
123147

@@ -149,11 +173,15 @@ Leon Yin <[email protected]>
149173

150174
Lion Krischer <[email protected]> <[email protected]>
151175

176+
luz paz <[email protected]>
177+
152178
Manan Kevadiya <[email protected]>
153179
Manan Kevadiya <[email protected]> <[email protected]>
154180

155181
Manuel Nuno Melo <[email protected]>
156182

183+
Marat Kopytjuk <[email protected]>
184+
157185
Marco Gorelli <[email protected]>
158186
Marco Gorelli <[email protected]> <[email protected]>
159187

@@ -215,19 +243,27 @@ Paul Ivanov <[email protected]> <[email protected]>
215243

216244
Per Parker <[email protected]>
217245

246+
Péter Leéh <[email protected]>
247+
218248
Peter Würtz <[email protected]>
219249
Peter Würtz <[email protected]> <[email protected]>
220250

221251
Phil Elson <[email protected]>
222252
Phil Elson <[email protected]> <[email protected]>
223253
Phil Elson <[email protected]> <[email protected]>
224254

255+
Philipp Nagel <[email protected]>
256+
225257
productivememberofsociety666 <[email protected]> none <[email protected]>
226258

227259
Rishikesh <[email protected]>
228260

261+
Ruth Nainggolan <[email protected]> Ruth G. N <[email protected]>
262+
229263
RyanPan <[email protected]>
230264

265+
Richard Sheridan <[email protected]>
266+
231267
Samesh Lakhotia <[email protected]>
232268
Samesh Lakhotia <[email protected]> <[email protected]>'
233269

@@ -236,6 +272,8 @@ Scott Lasley <[email protected]>
236272
Sebastian Raschka <[email protected]>
237273
Sebastian Raschka <[email protected]> <[email protected]>
238274

275+
ShawnChen1996 <[email protected]>
276+
239277
Sidharth Bansal <[email protected]>
240278
Sidharth Bansal <[email protected]> <[email protected]>
241279

@@ -257,6 +295,7 @@ Taras Kuzyo <[email protected]>
257295

258296
Terence Honles <[email protected]>
259297

298+
Thomas A Caswell <[email protected]>
260299
Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
261300
Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
262301
Thomas A Caswell <[email protected]> Thomas A Caswell <“[email protected]”>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``cbook.normalize_kwargs`` only supports passing artists and artist classes as second argument
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
Support for directly passing an alias mapping or None as second argument to
4+
`.cbook.normalize_kwargs` has been deprecated.

‎doc/api/widgets_api.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Widget classes
2727
Cursor
2828
MultiCursor
2929
Button
30+
_Buttons
3031
CheckButtons
3132
RadioButtons
3233
SliderBase

‎doc/conf.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ def _parse_skip_subdirs_file():
132132
'sphinxext.math_symbol_table',
133133
'sphinxext.missing_references',
134134
'sphinxext.mock_gui_toolkits',
135-
'sphinxext.skip_deprecated',
135+
'sphinxext.rcparams',
136136
'sphinxext.redirect_from',
137+
'sphinxext.skip_deprecated',
137138
'sphinx_copybutton',
138139
'sphinx_design',
139140
'sphinx_tags',
@@ -194,14 +195,16 @@ def _check_dependencies():
194195
gallery_order_sectionorder = 'sphinxext.gallery_order.sectionorder'
195196
gallery_order_subsectionorder = 'sphinxext.gallery_order.subsectionorder'
196197
clear_basic_units = 'sphinxext.util.clear_basic_units'
198+
patch_header = 'sphinxext.util.patch_header'
197199
matplotlib_reduced_latex_scraper = 'sphinxext.util.matplotlib_reduced_latex_scraper'
198200
else:
199201
# gallery_order.py from the sphinxext folder provides the classes that
200202
# allow custom ordering of sections and subsections of the gallery
201203
from sphinxext.gallery_order import (
202204
sectionorder as gallery_order_sectionorder,
203205
subsectionorder as gallery_order_subsectionorder)
204-
from sphinxext.util import clear_basic_units, matplotlib_reduced_latex_scraper
206+
from sphinxext.util import (clear_basic_units, matplotlib_reduced_latex_scraper,
207+
patch_header)
205208

206209
if parse_version(sphinx_gallery.__version__) >= parse_version('0.17.0'):
207210
sg_matplotlib_animations = (True, 'mp4')
@@ -305,7 +308,7 @@ def autodoc_process_bases(app, name, obj, options, bases):
305308
'reference_url': {'matplotlib': None, 'mpl_toolkits': None},
306309
'prefer_full_module': {r'mpl_toolkits\.'},
307310
'remove_config_comments': True,
308-
'reset_modules': ('matplotlib', clear_basic_units, 'sphinxext.util.patch_header'),
311+
'reset_modules': ('matplotlib', clear_basic_units, patch_header),
309312
'subsection_order': gallery_order_sectionorder,
310313
'thumbnail_size': (320, 224),
311314
'within_subsection_order': gallery_order_subsectionorder,
@@ -899,3 +902,4 @@ def setup(app):
899902
if sphinx.version_info[:2] < (7, 1):
900903
app.connect('html-page-context', add_html_cache_busting, priority=1000)
901904
generate_ScalarMappable_docs()
905+
app.config.autodoc_use_legacy_class_based = True

0 commit comments

Comments
 (0)