Skip to content

Commit 9d9663b

Browse files
committed
Merge branch 'main' into text-overhaul
1 parent 43d5d4e commit 9d9663b

File tree

94 files changed

+1373
-696
lines changed

Some content is hidden

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

94 files changed

+1373
-696
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
fetch-depth: 0
4747
persist-credentials: false
4848

49-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
49+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
5050
name: Install Python
5151
with:
5252
python-version: '3.11'
@@ -147,21 +147,17 @@ jobs:
147147
run: Remove-Item -Recurse C:\Strawberry
148148

149149
- name: Build wheels for CPython 3.14
150-
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
150+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
151151
with:
152152
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
153153
env:
154154
CIBW_BUILD: "cp314-* cp314t-*"
155155
CIBW_ENABLE: "cpython-freethreading cpython-prerelease"
156156
CIBW_ARCHS: ${{ matrix.cibw_archs }}
157157
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
158-
CIBW_BEFORE_TEST: >-
159-
python -m pip install
160-
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
161-
--upgrade --pre --only-binary=:all: contourpy numpy pillow
162158

163159
- name: Build wheels for CPython 3.13
164-
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
160+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
165161
with:
166162
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
167163
env:
@@ -170,23 +166,23 @@ jobs:
170166
CIBW_ARCHS: ${{ matrix.cibw_archs }}
171167

172168
- name: Build wheels for CPython 3.12
173-
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
169+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
174170
with:
175171
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
176172
env:
177173
CIBW_BUILD: "cp312-*"
178174
CIBW_ARCHS: ${{ matrix.cibw_archs }}
179175

180176
- name: Build wheels for CPython 3.11
181-
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
177+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
182178
with:
183179
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
184180
env:
185181
CIBW_BUILD: "cp311-*"
186182
CIBW_ARCHS: ${{ matrix.cibw_archs }}
187183

188184
- name: Build wheels for PyPy
189-
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3
185+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
190186
with:
191187
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
192188
env:
@@ -223,9 +219,9 @@ jobs:
223219
run: ls dist
224220

225221
- name: Generate artifact attestation for sdist and wheel
226-
uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
222+
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
227223
with:
228224
subject-path: dist/matplotlib-*
229225

230226
- name: Publish package distributions to PyPI
231-
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
227+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0

.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@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
44+
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
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
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
35+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
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@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
46+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
pull-requests: write
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
13+
- uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
1414
with:
1515
sync-labels: true

.github/workflows/linting.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
persist-credentials: false
17-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
17+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
1818
with:
1919
python-version: "3.x"
2020
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
@@ -32,15 +32,15 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Set up Python 3
35-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
35+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3636
with:
3737
python-version: '3.11'
3838

3939
- name: Install ruff
4040
run: pip3 install ruff
4141

4242
- name: Set up reviewdog
43-
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9
43+
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
4444

4545
- name: Run ruff
4646
env:
@@ -61,15 +61,15 @@ jobs:
6161
persist-credentials: false
6262

6363
- name: Set up Python 3
64-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
64+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6565
with:
6666
python-version: '3.11'
6767

6868
- name: Install mypy
6969
run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt
7070

7171
- name: Set up reviewdog
72-
uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.9
72+
uses: reviewdog/action-setup@d8edfce3dd5e1ec6978745e801f9c50b5ef80252 # v1.4.0
7373

7474
- name: Run mypy
7575
env:
@@ -92,7 +92,7 @@ jobs:
9292
persist-credentials: false
9393

9494
- name: eslint
95-
uses: reviewdog/action-eslint@2fee6dd72a5419ff4113f694e2068d2a03bb35dd # v1.33.2
95+
uses: reviewdog/action-eslint@556a3fdaf8b4201d4d74d406013386aa4f7dab96 # v1.34.0
9696
with:
9797
filter_mode: nofilter
9898
github_token: ${{ secrets.GITHUB_TOKEN }}

.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@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
20+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
2121
with:
2222
python-version: '3.11'
2323

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

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

.github/workflows/pr_welcome.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
steps:
1212
- uses: actions/first-interaction@753c925c8d1ac6fede23781875376600628d9b5d # v3.0.0
1313
with:
14-
repo-token: ${{ secrets.GITHUB_TOKEN }}
15-
pr-message: >+
14+
repo_token: ${{ secrets.GITHUB_TOKEN }}
15+
pr_message: >+
1616
Thank you for opening your first PR into Matplotlib!
1717
1818

.github/workflows/stale-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository == 'matplotlib/matplotlib'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
12+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
operations-per-run: 300

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository == 'matplotlib/matplotlib'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
12+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
operations-per-run: 20

.github/workflows/tests.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,15 @@ jobs:
7777
pygobject-ver: '<3.52.0'
7878
- os: ubuntu-24.04
7979
python-version: '3.12'
80-
- os: macos-13 # This runner is on Intel chips.
81-
# merge numpy and pandas install in nighties test when this runner is dropped
80+
- os: macos-14 # This runner is on M1 (arm64) chips.
8281
python-version: '3.11'
82+
# https://github.com/matplotlib/matplotlib/issues/29732
83+
pygobject-ver: '<3.52.0'
8384
- os: macos-14 # This runner is on M1 (arm64) chips.
8485
python-version: '3.12'
8586
# https://github.com/matplotlib/matplotlib/issues/29732
8687
pygobject-ver: '<3.52.0'
87-
- os: macos-14 # This runner is on M1 (arm64) chips.
88+
- os: macos-15 # This runner is on M1 (arm64) chips.
8889
python-version: '3.13'
8990
# https://github.com/matplotlib/matplotlib/issues/29732
9091
pygobject-ver: '<3.52.0'
@@ -115,7 +116,7 @@ jobs:
115116
git commit -m 'Preload test images from branch text-overhaul-figures'
116117
117118
- name: Set up Python ${{ matrix.python-version }}
118-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
119+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
119120
with:
120121
python-version: ${{ matrix.python-version }}
121122
allow-prereleases: true
@@ -316,13 +317,7 @@ jobs:
316317
python -m pip install pytz tzdata # Must be installed for Pandas.
317318
python -m pip install \
318319
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
319-
--upgrade --only-binary=:all: numpy
320-
# wheels for intel osx is not always available on nightly wheels index, merge this back into
321-
# the above install command when the OSX-13 (intel) runners are dropped.
322-
python -m pip install \
323-
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
324-
--upgrade --only-binary=:all: pandas || true
325-
320+
--upgrade --only-binary=:all: numpy pandas
326321
327322
- name: Install Matplotlib
328323
run: |
@@ -416,7 +411,7 @@ jobs:
416411
fi
417412
- name: Upload code coverage
418413
if: ${{ !cancelled() && github.event_name != 'schedule' }}
419-
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
414+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
420415
with:
421416
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}"
422417
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)