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 ce23c88

Browse filesBrowse files
asmeurerasmeurer
committed
Merge branch 'main' into output-base-name
2 parents 7d416cf + c9402f3 commit ce23c88
Copy full SHA for ce23c88

File tree

Expand file treeCollapse file tree

539 files changed

+36653
-12152
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

539 files changed

+36653
-12152
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ cache:
4545

4646
init:
4747
- ps:
48-
# Pinned due to https://github.com/mamba-org/mamba/issues/3467
4948
Invoke-Webrequest
50-
-URI https://github.com/mamba-org/micromamba-releases/releases/download/1.5.10-0/micromamba-win-64.tar.bz2
49+
-URI https://micro.mamba.pm/api/micromamba/win-64/latest
5150
-OutFile C:\projects\micromamba.tar.bz2
5251
- ps: C:\PROGRA~1\7-Zip\7z.exe x C:\projects\micromamba.tar.bz2 -aoa -oC:\projects\
5352
- ps: C:\PROGRA~1\7-Zip\7z.exe x C:\projects\micromamba.tar -ttar -aoa -oC:\projects\
5453
- 'set PATH=C:\projects\Library\bin;%PATH%'
5554
- micromamba shell init --shell cmd.exe
5655
- micromamba config set always_yes true
5756
- micromamba config prepend channels conda-forge
57+
- micromamba info
5858

5959
install:
6060
- micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
@@ -91,7 +91,7 @@ artifacts:
9191

9292
on_finish:
9393
- micromamba install codecov
94-
- codecov -e PYTHON_VERSION PLATFORM -n "$PYTHON_VERSION Windows"
94+
- codecov -e PYTHON_VERSION PLATFORM -n "%PYTHON_VERSION% Windows"
9595

9696
on_failure:
9797
# Generate a html for visual tests

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ commands:
9898
parameters:
9999
numpy_version:
100100
type: string
101-
default: "~=2.0.0"
101+
default: ""
102102
steps:
103103
- run:
104104
name: Install Python dependencies

‎.github/ISSUE_TEMPLATE/bug_report.yml

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/bug_report.yml
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ body:
1515
attributes:
1616
label: Code for reproduction
1717
description: >-
18-
If possible, please provide a minimum self-contained example.
18+
If possible, please provide a minimum self-contained example. If you
19+
have used generative AI as an aid see
20+
https://matplotlib.org/devdocs/devel/contribute.html#restrictions-on-generative-ai-usage
1921
placeholder: Paste your code here. This field is automatically formatted as Python code.
2022
render: Python
2123
validations:

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+11-4Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@ out the development guide https://matplotlib.org/devdocs/devel/index.html
44
-->
55

66
## PR summary
7-
<!-- Please provide at least 1-2 sentences describing the pull request in detail
8-
(Why is this change required? What problem does it solve?) and link to relevant
9-
issues and PRs.
7+
<!-- Please describe the pull request, using the questions below as guidance, and link to any relevant issues and PRs:
108
11-
Also please summarize the changes in the title, for example "Raise ValueError on
9+
- Why is this change necessary?
10+
- What problem does it solve?
11+
- What is the reasoning for this implementation?
12+
13+
Additionally, please summarize the changes in the title, for example "Raise ValueError on
1214
non-numeric input to set_xlim" and avoid non-descriptive titles such as "Addresses
1315
issue #8576".
16+
17+
If possible, please provide a minimum self-contained example. If you have used
18+
generative AI as an aid in preparing this PR, see
19+
20+
https://matplotlib.org/devdocs/devel/contribute.html#restrictions-on-generative-ai-usage
1421
-->
1522

1623

‎.github/workflows/cibuildwheel.yml

Copy file name to clipboardExpand all lines: .github/workflows/cibuildwheel.yml
+20-42Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,17 @@ jobs:
3434
'CI: Run cibuildwheel')
3535
)
3636
name: Build sdist
37-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-latest
3838
outputs:
3939
SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4343
with:
4444
fetch-depth: 0
45+
persist-credentials: false
4546

46-
- uses: actions/setup-python@v5
47+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
4748
name: Install Python
4849
with:
4950
python-version: '3.10'
@@ -69,7 +70,7 @@ jobs:
6970
run: twine check dist/*
7071

7172
- name: Upload sdist result
72-
uses: actions/upload-artifact@v4
73+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
7374
with:
7475
name: cibw-sdist
7576
path: dist/*.tar.gz
@@ -114,96 +115,73 @@ jobs:
114115
CIBW_TEST_COMMAND: >-
115116
python {package}/ci/check_version_number.py
116117
MACOSX_DEPLOYMENT_TARGET: "10.12"
117-
MPL_DISABLE_FH4: "yes"
118118
strategy:
119119
matrix:
120120
include:
121-
- os: ubuntu-20.04
121+
- os: ubuntu-latest
122122
cibw_archs: "x86_64"
123-
- os: ubuntu-20.04
123+
- os: ubuntu-24.04-arm
124124
cibw_archs: "aarch64"
125125
- os: windows-latest
126126
cibw_archs: "auto64"
127-
- os: macos-12
127+
- os: macos-13
128128
cibw_archs: "x86_64"
129129
- os: macos-14
130130
cibw_archs: "arm64"
131131

132132
steps:
133-
- name: Set up QEMU
134-
if: matrix.cibw_archs == 'aarch64'
135-
uses: docker/setup-qemu-action@v3
136-
with:
137-
platforms: arm64
138-
139133
- name: Download sdist
140-
uses: actions/download-artifact@v4
134+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
141135
with:
142136
name: cibw-sdist
143137
path: dist/
144138

145139
- name: Build wheels for CPython 3.13
146-
uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4 # v2.21.2
140+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
147141
with:
148142
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
149143
env:
150144
CIBW_BUILD: "cp313-* cp313t-*"
151-
# No free-threading wheels for NumPy; musllinux skipped for main builds also.
152-
CIBW_SKIP: "cp313t-win_amd64 *-musllinux_aarch64"
153-
CIBW_BUILD_FRONTEND:
154-
"pip; args: --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
155-
CIBW_FREE_THREADED_SUPPORT: true
145+
CIBW_ENABLE: cpython-freethreading
156146
# No free-threading wheels available for aarch64 on Pillow.
157147
CIBW_TEST_SKIP: "cp313t-manylinux_aarch64"
158-
# We need pre-releases to get the nightly wheels.
159-
CIBW_BEFORE_TEST: >-
160-
pip install --pre
161-
--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
162-
contourpy numpy pillow
163148
CIBW_ARCHS: ${{ matrix.cibw_archs }}
164149

165150
- name: Build wheels for CPython 3.12
166-
uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4 # v2.21.2
151+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
167152
with:
168153
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
169154
env:
170155
CIBW_BUILD: "cp312-*"
171156
CIBW_ARCHS: ${{ matrix.cibw_archs }}
172157

173158
- name: Build wheels for CPython 3.11
174-
uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4 # v2.21.2
159+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
175160
with:
176161
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
177162
env:
178163
CIBW_BUILD: "cp311-*"
179164
CIBW_ARCHS: ${{ matrix.cibw_archs }}
180165

181166
- name: Build wheels for CPython 3.10
182-
uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4 # v2.21.2
167+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
183168
with:
184169
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
185170
env:
186171
CIBW_BUILD: "cp310-*"
187172
CIBW_ARCHS: ${{ matrix.cibw_archs }}
188173

189174
- name: Build wheels for PyPy
190-
uses: pypa/cibuildwheel@f1859528322d7b29d4493ee241a167807661dfb4 # v2.21.2
175+
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
191176
with:
192177
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
193178
env:
194179
CIBW_BUILD: "pp310-*"
195180
CIBW_ARCHS: ${{ matrix.cibw_archs }}
196-
# Work around for https://github.com/pypa/setuptools/issues/4571
197-
# This can be removed once kiwisolver has wheels for PyPy 3.10
198-
# https://github.com/nucleic/kiwi/pull/182
199-
CIBW_BEFORE_TEST: >-
200-
export PIP_CONSTRAINT=pypy-constraint.txt &&
201-
echo "setuptools!=72.2.0" > $PIP_CONSTRAINT &&
202-
pip install kiwisolver &&
203-
unset PIP_CONSTRAINT
181+
CIBW_ENABLE: pypy
204182
if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest'
205183

206-
- uses: actions/upload-artifact@v4
184+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
207185
with:
208186
name: cibw-wheels-${{ runner.os }}-${{ matrix.cibw_archs }}
209187
path: ./wheelhouse/*.whl
@@ -221,7 +199,7 @@ jobs:
221199
contents: read
222200
steps:
223201
- name: Download packages
224-
uses: actions/download-artifact@v4
202+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
225203
with:
226204
pattern: cibw-*
227205
path: dist
@@ -231,9 +209,9 @@ jobs:
231209
run: ls dist
232210

233211
- name: Generate artifact attestation for sdist and wheel
234-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
212+
uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
235213
with:
236214
subject-path: dist/matplotlib-*
237215

238216
- name: Publish package distributions to PyPI
239-
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
217+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4

‎.github/workflows/circleci.yml

Copy file name to clipboardExpand all lines: .github/workflows/circleci.yml
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,20 @@ jobs:
2828
runs-on: ubuntu-latest
2929
name: Post warnings/errors as review
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
with:
33+
persist-credentials: false
3234

3335
- name: Fetch result artifacts
3436
id: fetch-artifacts
37+
env:
38+
target_url: "${{ github.event.target_url }}"
3539
run: |
36-
python .circleci/fetch_doc_logs.py "${{ github.event.target_url }}"
40+
python .circleci/fetch_doc_logs.py "${target_url}"
3741
3842
- name: Set up reviewdog
3943
if: "${{ steps.fetch-artifacts.outputs.count != 0 }}"
40-
uses: reviewdog/action-setup@v1
44+
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887 # v1.3.0
4145
with:
4246
reviewdog_version: latest
4347

‎.github/workflows/clean_pr.yml

Copy file name to clipboardExpand all lines: .github/workflows/clean_pr.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414
with:
1515
fetch-depth: '0'
16+
persist-credentials: false
1617
- name: Check for added-and-deleted files
1718
run: |
1819
git fetch --quiet origin "$GITHUB_BASE_REF"

‎.github/workflows/codeql-analysis.yml

Copy file name to clipboardExpand all lines: .github/workflows/codeql-analysis.yml
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
with:
31+
persist-credentials: false
3032

3133
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
3335
with:
3436
languages: ${{ matrix.language }}
3537

@@ -40,4 +42,4 @@ jobs:
4042
pip install --user -v .
4143
4244
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@v3
45+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9

‎.github/workflows/conflictcheck.yml

Copy file name to clipboardExpand all lines: .github/workflows/conflictcheck.yml
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ on:
99
pull_request_target:
1010
types: [synchronize]
1111

12-
permissions:
13-
pull-requests: write
14-
1512
jobs:
1613
main:
1714
runs-on: ubuntu-latest
15+
permissions:
16+
pull-requests: write
1817
steps:
1918
- name: Check if PRs have merge conflicts
20-
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
19+
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
2120
with:
2221
dirtyLabel: "status: needs rebase"
2322
repoToken: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/cygwin.yml

Copy file name to clipboardExpand all lines: .github/workflows/cygwin.yml
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,12 @@ jobs:
7979
- name: Fix line endings
8080
run: git config --global core.autocrlf input
8181

82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8383
with:
8484
fetch-depth: 0
85+
persist-credentials: false
8586

86-
- uses: cygwin/cygwin-install-action@v4
87+
- uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559 # v5
8788
with:
8889
packages: >-
8990
ccache gcc-g++ gdb git graphviz libcairo-devel libffi-devel
@@ -139,21 +140,21 @@ jobs:
139140
# FreeType build fails with bash, succeeds with dash
140141

141142
- name: Cache pip
142-
uses: actions/cache@v4
143+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
143144
with:
144145
path: C:\cygwin\home\runneradmin\.cache\pip
145146
key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
146147
restore-keys: ${{ matrix.os }}-py3.${{ matrix.python-minor-version }}-pip-
147148

148149
- name: Cache ccache
149-
uses: actions/cache@v4
150+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
150151
with:
151152
path: C:\cygwin\home\runneradmin\.ccache
152153
key: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-${{ hashFiles('src/*') }}
153154
restore-keys: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-
154155

155156
- name: Cache Matplotlib
156-
uses: actions/cache@v4
157+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
157158
with:
158159
path: |
159160
C:\cygwin\home\runneradmin\.cache\matplotlib

‎.github/workflows/do_not_merge.yml

Copy file name to clipboardExpand all lines: .github/workflows/do_not_merge.yml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
echo "This PR cannot be merged because it has one of the following labels: "
2424
echo "* status: needs comment/discussion"
2525
echo "* status: waiting for other PR"
26-
echo "${{env.has_tag}}"
2726
exit 1
2827
- name: Allow merging
2928
if: ${{'false' == env.has_tag}}

‎.github/workflows/good-first-issue.yml

Copy file name to clipboardExpand all lines: .github/workflows/good-first-issue.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
steps:
1414
- name: Add comment
15-
uses: peter-evans/create-or-update-comment@v4
15+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
1616
with:
1717
issue-number: ${{ github.event.issue.number }}
1818
body: |

‎.github/workflows/labeler.yml

Copy file name to clipboardExpand all lines: .github/workflows/labeler.yml
+1-1Lines 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@v5
13+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1414
with:
1515
sync-labels: true

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.