8000 Merge branch 'main' into output-base-name · matplotlib/matplotlib@13e5291 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 13e5291

Browse files
asmeurerasmeurer
committed
Merge branch 'main' into output-base-name
2 parents f654a74 + 7c49d52 commit 13e5291

File tree

603 files changed

+11279
-119068
lines changed

Some content is hidden

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

603 files changed

+11279
-119068
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ install:
6363
test_script:
6464
# Now build the thing..
6565
- set LINK=/LIBPATH:%cd%\lib
66-
- pip install -v --no-build-isolation --config-settings=setup-args="--vsenv" --editable .[dev]
66+
- pip install -v --no-build-isolation --editable .[dev]
6767
# this should show no freetype dll...
6868
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
6969
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'

‎.flake8

Lines changed: 0 additions & 91 deletions
D7AE
This file was deleted.

‎.github/workflows/cibuildwheel.yml

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ permissions:
2424
jobs:
2525
build_sdist:
2626
if: >-
27-
github.event_name == 'push' ||
28-
github.event_name == 'pull_request' && (
29-
(
30-
github.event.action == 'labeled' &&
31-
github.event.label.name == 'CI: Run cibuildwheel'
32-
) ||
33-
contains(github.event.pull_request.labels.*.name,
34-
'CI: Run cibuildwheel')
27+
github.repository == 'matplotlib/matplotlib' && (
28+
github.event_name == 'push' ||
29+
github.event_name == 'pull_request' && (
30+
(
31+
github.event.action == 'labeled' &&
32+
github.event.label.name == 'CI: Run cibuildwheel'
33+
) ||
34+
contains(github.event.pull_request.labels.*.name,
35+
'CI: Run cibuildwheel')
36+
)
3537
)
3638
name: Build sdist
3739
runs-on: ubuntu-latest
@@ -44,10 +46,10 @@ jobs:
4446
fetch-depth: 0
4547
persist-credentials: false
4648

47-
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
49+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
4850
name: Install Python
4951
with:
50-
python-version: '3.10'
52+
python-version: '3.11'
5153

5254
# Something changed somewhere that prevents the downloaded-at-build-time
5355
# licenses from being included in built wheels, so pre-download them so
@@ -70,22 +72,24 @@ jobs:
7072
run: twine check dist/*
7173

7274
- name: Upload sdist result
73-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698f F438 dd19549f0f0fb45cf08 # v4.6.0
75+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7476
with:
7577
name: cibw-sdist
7678
path: dist/*.tar.gz
7779
if-no-files-found: error
7880

7981
build_wheels:
8082
if: >-
81-
github.event_name == 'push' ||
82-
github.event_name == 'pull_request' && (
83-
(
84-
github.event.action == 'labeled' &&
85-
github.event.label.name == 'CI: Run cibuildwheel'
86-
) ||
87-
contains(github.event.pull_request.labels.*.name,
88-
'CI: Run cibuildwheel')
83+
github.repository == 'matplotlib/matplotlib' && (
84+
github.event_name == 'push' ||
85+
github.event_name == 'pull_request' && (
86+
(
87+
github.event.action == 'labeled' &&
88+
github.event.label.name == 'CI: Run cibuildwheel'
89+
) ||
90+
contains(github.event.pull_request.labels.*.name,
91+
'CI: Run cibuildwheel')
92+
)
8993
)
9094
needs: build_sdist
9195
name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }}
@@ -131,13 +135,13 @@ jobs:
131135

132136
steps:
133137
- name: Download sdist
134-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
138+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
135139
with:
136140
name: cibw-sdist
137141
path: dist/
138142

139143
- name: Build wheels for CPython 3.13
140-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
144+
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
141145
with:
142146
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
143147
env:
@@ -148,47 +152,42 @@ jobs:
148152
CIBW_ARCHS: ${{ matrix.cibw_archs }}
149153

150154
- name: Build wheels for CPython 3.12
151-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
155+
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
152156
with:
153157
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
154158
env:
155159
CIBW_BUILD: "cp312-*"
156160
CIBW_ARCHS: ${{ matrix.cibw_archs }}
157161

158162
- name: Build wheels for CPython 3.11
159-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
163+
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
160164
with:
161165
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
162166
env:
163167
CIBW_BUILD: "cp311-*"
164168
CIBW_ARCHS: ${{ matrix.cibw_archs }}
165169

166-
- name: Build wheels for CPython 3.10
167-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
168-
with:
169-
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
170-
env:
171-
CIBW_BUILD: "cp310-*"
172-
CIBW_ARCHS: ${{ matrix.cibw_archs }}
173170

174171
- name: Build wheels for PyPy
175-
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
172+
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
176173
with:
177174
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
178175
env:
179-
CIBW_BUILD: "pp310-*"
176+
CIBW_BUILD: "pp311-*"
180177
CIBW_ARCHS: ${{ matrix.cibw_archs }}
181178
CIBW_ENABLE: pypy
179+
# No wheels available for Pillow with pp311 yet.
180+
CIBW_TEST_SKIP: "pp311*"
182181
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
183182

184-
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
183+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
185184
with:
186185
name: cibw-wheels-${{ runner.os }}-${{ matrix.cibw_archs }}
187186
path: ./wheelhouse/*.whl
188187
if-no-files-found: error
189188

190189
publish:
191-
if: github.event_name == 'push' && github.ref_type == 'tag'
190+
if: github.repository == 'matplotlib/matplotlib' && github.event_name == 'push' && github.ref_type == 'tag'
192191
name: Upload release to PyPI
193192
needs: [build_sdist, build_wheels]
194193
runs-on: ubuntu-latest
@@ -199,7 +198,7 @@ jobs:
199198
contents: read
200199
steps:
201200
- name: Download packages
202-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
201+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
203202
with:
204203
pattern: cibw-*
205204
path: dist
@@ -209,7 +208,7 @@ jobs:
209208
run: ls dist
210209

211210
- name: Generate artifact attestation for sdist and wheel
212-
uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
211+
uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
213212
with:
214213
subject-path: dist/matplotlib-*
215214

‎.github/workflows/circleci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- name: GitHub Action step
1313
uses:
14-
scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1 # v1.0.0
14+
scientific-python/circleci-artifacts-redirector-action@7eafdb60666f57706a5525a2f5eb76224dc8779b # v1.1.0
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
1717
api-token: ${{ secrets.CIRCLECI_TOKEN }}
@@ -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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
jobs:
1414
analyze:
15+
if: github.repository == 'matplotlib/matplotlib'
1516
name: Analyze
1617
runs-on: ubuntu-latest
1718
permissions:
@@ -31,7 +32,7 @@ jobs:
3132
persist-credentials: false
3233

3334
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
35+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
3536
with:
3637
languages: ${{ matrix.language }}
3738

@@ -42,4 +43,4 @@ jobs:
4243
pip install --user -v .
4344
4445
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
46+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18

‎.github/workflows/conflictcheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
main:
14+
if: github.repository == 'matplotlib/matplotlib'
1415
runs-on: ubuntu-latest
1516
permissions:
1617
pull-requests: write

‎.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@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
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@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
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@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
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: 4 additions & 4 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@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.11'
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
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
set -o pipefail
3535
tox -e stubtest | \
36-
sed -e "s!.tox/stubtest/lib/python3.10/site-packages!lib!g" | \
36+
sed -e "s!.tox/stubtest/lib/python3.11/site-packages!lib!g" | \
3737
reviewdog \
3838
-efm '%Eerror: %m' \
3939
-efm '%CStub: in file %f:%l' \

‎.github/workflows/nightlies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
ls -l dist/
6060
6161
- name: Upload wheels to Anaconda Cloud as nightlies
62-
uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
62+
uses: scientific-python/upload-nightly-action@b36e8c0c10dbcfd2e05bf95f17ef8c14fd708dbf # 0.6.2
6363
with:
6464
artifacts_path: dist
6565
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }}

0 commit comments

Comments
 (0)
0