Skip to content

Commit 1bc5c19

Browse files
jayaddisonjayaddison
committed
Merge branch 'main' into issue-29749/add-ubuntu2404-runner
Conflicts: .github/workflows/tests.yml
2 parents e68aa87 + 0d11978 commit 1bc5c19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+786
-321
lines changed

‎.github/workflows/cibuildwheel.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
fetch-depth: 0
4545
persist-credentials: false
4646

47-
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
47+
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
4848
name: Install Python
4949
with:
5050
python-version: '3.10'
@@ -70,7 +70,7 @@ jobs:
7070
run: twine check dist/*
7171

7272
- name: Upload sdist result
73-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
73+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7474
with:
7575
name: cibw-sdist
7676
path: dist/*.tar.gz
@@ -131,7 +131,7 @@ jobs:
131131

132132
steps:
133133
- name: Download sdist
134-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
134+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
135135
with:
136136
name: cibw-sdist
137137
path: dist/
@@ -181,7 +181,7 @@ jobs:
181181
CIBW_ENABLE: pypy
182182
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
183183

184-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
184+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
185185
with:
186186
name: cibw-wheels-${{ runner.os }}-${{ matrix.cibw_archs }}
187187
path: ./wheelhouse/*.whl
@@ -199,7 +199,7 @@ jobs:
199199
contents: read
200200
steps:
201201
- name: Download packages
202-
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
202+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
203203
with:
204204
pattern: cibw-*
205205
path: dist

‎.github/workflows/circleci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
4242
- name: Set up reviewdog
4343
if: "${{ steps.fetch-artifacts.outputs.count != 0 }}"
44-
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887 # v1.3.0
44+
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
4545
with:
4646
reviewdog_version: latest
4747

‎.github/workflows/codeql-analysis.yml

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

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
34+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3535
with:
3636
languages: ${{ matrix.language }}
3737

@@ -42,4 +42,4 @@ jobs:
4242
pip install --user -v .
4343
4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
45+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

‎.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@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
143+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
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@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
150+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
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@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
157+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
158158
with:
159159
path: |
160160
C:\cygwin\home\runneradmin\.cache\matplotlib

‎.github/workflows/mypy-stubtest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
persist-credentials: false
1818

1919
- name: Set up Python 3
20-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
20+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
2121
with:
2222
python-version: '3.10'
2323

2424
- name: Set up reviewdog
25-
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887 # v1.3.9
25+
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9
2626

2727
- name: Install tox
2828
run: python -m pip install tox

‎.github/workflows/reviewdog.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
persist-credentials: false
1818

1919
- name: Set up Python 3
20-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
20+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
2121
with:
2222
python-version: '3.10'
2323

2424
- name: Install flake8
2525
run: pip3 install -r requirements/testing/flake8.txt
2626

2727
- name: Set up reviewdog
28-
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887 # v1.3.9
28+
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9
2929

3030
- name: Run flake8
3131
env:
@@ -46,15 +46,15 @@ jobs:
4646
persist-credentials: false
4747

4848
- name: Set up Python 3
49-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
49+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
5050
with:
5151
python-version: '3.10'
5252

5353
- name: Install mypy
5454
run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt
5555

5656
- name: Set up reviewdog
57-
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887 # v1.3.9
57+
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9
5858

5959
- name: Run mypy
6060
env:
@@ -77,7 +77,7 @@ jobs:
7777
persist-credentials: false
7878

7979
- name: eslint
80-
uses: reviewdog/action-eslint@9b5b0150e399e1f007ee3c27bc156549810a64e3 # v1.33.0
80+
uses: reviewdog/action-eslint@2fee6dd72a5419ff4113f694e2068d2a03bb35dd # v1.33.2
8181
with:
8282
filter_mode: nofilter
8383
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/tests.yml

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,17 @@ jobs:
4848
matrix:
4949
include:
5050
- name-suffix: "(Minimum Versions)"
51-
os: ubuntu-20.04
52-
python-version: '3.10'
51+
os: ubuntu-22.04
52+
python-version: '3.11'
5353
extra-requirements: '-c requirements/testing/minver.txt'
5454
delete-font-cache: true
55-
# Oldest versions with Py3.10 wheels.
56-
pyqt5-ver: '==5.15.5 sip==6.3.0'
57-
pyqt6-ver: '==6.2.0 PyQt6-Qt6==6.2.0'
58-
pyside2-ver: '==5.15.2.1'
59-
pyside6-ver: '==6.2.0'
60-
- os: ubuntu-20.04
61-
python-version: '3.10'
62-
extra-requirements: '-r requirements/testing/extra.txt'
63-
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
64-
# https://github.com/matplotlib/matplotlib/pull/26052#issuecomment-1574595954
6555
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
66-
pyqt6-ver: '!=6.5.1,!=6.6.0,!=6.7.1'
56+
pyqt6-ver: '!=6.6.0'
6757
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
6858
pyside6-ver: '!=6.5.1'
6959
- os: ubuntu-22.04
7060
python-version: '3.11'
61+
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
7162
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
7263
pyqt6-ver: '!=6.6.0'
7364
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
@@ -123,15 +114,7 @@ jobs:
123114
persist-credentials: false
124115

125116
- name: Set up Python ${{ matrix.python-version }}
126-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
127-
if: matrix.python-version != '3.13t'
128-
with:
129-
python-version: ${{ matrix.python-version }}
130-
allow-prereleases: true
131-
132-
- name: Set up Python ${{ matrix.python-version }}
133-
uses: Quansight-Labs/setup-python@869aeafb7eeb9dc48ba68acc0479e6fc3fd7ce5e # v5.4.0
134-
if: matrix.python-version == '3.13t'
117+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
135118
with:
136119
python-version: ${{ matrix.python-version }}
137120
allow-prereleases: true
@@ -183,11 +166,7 @@ jobs:
183166
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
184167
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
185168
fi
186-
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
187-
sudo apt-get install -yy --no-install-recommends \
188-
libgirepository1.0-dev \
189-
libopengl0
190-
elif [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
169+
if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
191170
sudo apt-get install -yy --no-install-recommends \
192171
gir1.2-gtk-4.0 \
193172
libgirepository1.0-dev
@@ -217,31 +196,31 @@ jobs:
217196
esac
218197
219198
- name: Cache pip
220-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
199+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
221200
if: startsWith(runner.os, 'Linux')
222201
with:
223202
path: ~/.cache/pip
224203
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
225204
restore-keys: |
226205
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
227206
- name: Cache pip
228-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
207+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
229208
if: startsWith(runner.os, 'macOS')
230209
with:
231210
path: ~/Library/Caches/pip
232211
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
233212
restore-keys: |
234213
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
235214
- name: Cache ccache
236-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
215+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
237216
with:
238217
path: |
239218
~/.ccache
240219
key: ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
241220
restore-keys: |
242221
${{ matrix.os }}-py${{ matrix.python-version }}-ccache-
243222
- name: Cache Matplotlib
244-
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
223+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
245224
with:
246225
path: |
247226
~/.cache/matplotlib
@@ -442,7 +421,7 @@ jobs:
442421
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}"
443422
token: ${{ secrets.CODECOV_TOKEN }}
444423

445-
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
424+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
446425
if: failure()
447426
with:
448427
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }} result images"

‎doc/api/next_api_changes/behavior/29832-REC.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Mixing positional and keyword arguments for ``legend`` handles and labels...
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
... is no longer valid. If passing *handles* and *labels* to ``legend``, they must
4+
now be passed either both positionally or both as keywords.
5+
6+
Legend labels for ``plot``
7+
~~~~~~~~~~~~~~~~~~~~~~~~~~
8+
Previously if a sequence was passed to the *label* parameter of `~.Axes.plot` when
9+
plotting a single dataset, the sequence was automatically cast to string for the legend
10+
label. Now, if the sequence length is not one an error is raised. To keep the old
11+
behavior, cast the sequence to string before passing.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
``axes_grid.Grid.ngrids``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~
3+
This attribute has been deprecated and renamed ``n_axes``, consistently with
4+
the new name of the `~.axes_grid.Grid` constructor parameter that allows
5+
setting the actual number of axes in the grid (the old parameter, ``ngrids``,
6+
did not actually work since Matplotlib 3.3).
7+
8+
The same change has been made in ``axes_grid.ImageGrid``.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
``DviFont.widths``
2+
~~~~~~~~~~~~~~~~~~
3+
... is deprecated with no replacement.

0 commit comments

Comments
 (0)