Skip to content

Commit efcb43f

Browse files
r3kster3kste
authored
Merge branch 'Impaler343:main' into path-simplify
2 parents 2491647 + d347c32 commit efcb43f

File tree

91 files changed

+2638
-440
lines changed

Some content is hidden

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

91 files changed

+2638
-440
lines changed

‎.github/workflows/cibuildwheel.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,39 +135,39 @@ jobs:
135135
path: dist/
136136

137137
- name: Build wheels for CPython 3.12
138-
uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65 # v2.18.0
138+
uses: pypa/cibuildwheel@932529cab190fafca8c735a551657247fa8f8eaf # v2.19.1
139139
with:
140140
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
141141
env:
142142
CIBW_BUILD: "cp312-*"
143143
CIBW_ARCHS: ${{ matrix.cibw_archs }}
144144

145145
- name: Build wheels for CPython 3.11
146-
uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65 # v2.18.0
146+
uses: pypa/cibuildwheel@932529cab190fafca8c735a551657247fa8f8eaf # v2.19.1
147147
with:
148148
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
149149
env:
150150
CIBW_BUILD: "cp311-*"
151151
CIBW_ARCHS: ${{ matrix.cibw_archs }}
152152

153153
- name: Build wheels for CPython 3.10
154-
uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65 # v2.18.0
154+
uses: pypa/cibuildwheel@932529cab190fafca8c735a551657247fa8f8eaf # v2.19.1
155155
with:
156156
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
157157
env:
158158
CIBW_BUILD: "cp310-*"
159159
CIBW_ARCHS: ${{ matrix.cibw_archs }}
160160

161161
- name: Build wheels for CPython 3.9
162-
uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65 # v2.18.0
162+
uses: pypa/cibuildwheel@932529cab190fafca8c735a551657247fa8f8eaf # v2.19.1
163163
with:
164164
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
165165
env:
166166
CIBW_BUILD: "cp39-*"
167167
CIBW_ARCHS: ${{ matrix.cibw_archs }}
168168

169169
- name: Build wheels for PyPy
170-
uses: pypa/cibuildwheel@711a3d017d0729f3edde18545fee967f03d65f65 # v2.18.0
170+
uses: pypa/cibuildwheel@932529cab190fafca8c735a551657247fa8f8eaf # v2.19.1
171171
with:
172172
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
173173
env:
@@ -189,6 +189,8 @@ jobs:
189189
environment: release
190190
permissions:
191191
id-token: write
192+
attestations: write
193+
contents: read
192194
steps:
193195
- name: Download packages
194196
uses: actions/download-artifact@v4
@@ -200,5 +202,10 @@ jobs:
200202
- name: Print out packages
201203
run: ls dist
202204

205+
- name: Generate artifact attestation for sdist and wheel
206+
uses: actions/attest-build-provenance@bdd51370e0416ac948727f861e03c2f05d32d78e # v1.3.2
207+
with:
208+
subject-path: dist/matplotlib-*
209+
203210
- name: Publish package distributions to PyPI
204-
uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
211+
uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0

‎.github/workflows/circleci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
name: Run CircleCI artifacts redirector
1111
steps:
1212
- name: GitHub Action step
13-
uses: larsoner/circleci-artifacts-redirector-action@master
13+
uses:
14+
scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1 # v1.0.0
1415
with:
1516
repo-token: ${{ secrets.GITHUB_TOKEN }}
1617
api-token: ${{ secrets.CIRCLECI_TOKEN }}

‎.github/workflows/conflictcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check if PRs have merge conflicts
20-
uses: eps1lon/actions-label-merge-conflict@6d74047dcef155976a15e4a124dde2c7fe0c5522 # v3.0.1
20+
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
2121
with:
2222
dirtyLabel: "status: needs rebase"
2323
repoToken: "${{ secrets.GITHUB_TOKEN }}"

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ repos:
7979
- id: yamllint
8080
args: ["--strict", "--config-file=.yamllint.yml"]
8181
- repo: https://github.com/python-jsonschema/check-jsonschema
82-
rev: 0.28.1
82+
rev: 0.28.4
8383
hooks:
8484
# TODO: Re-enable this when https://github.com/microsoft/azure-pipelines-vscode/issues/567 is fixed.
8585
# - id: check-azure-pipelines

‎.yamllint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extends: default
33

44
rules:
55
line-length:
6-
max: 111
6+
max: 120
77
allow-non-breakable-words: true
88
truthy:
99
check-keys: false

‎doc/_static/switcher.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
{
33
"name": "3.9 (stable)",
44
"version": "stable",
5-
"url": "https://matplotlib.org/stable/"
5+
"url": "https://matplotlib.org/stable/",
6+
"preferred": true
67
},
78
{
89
"name": "3.10 (dev)",

‎doc/api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Alphabetical list of modules:
126126
sphinxext_mathmpl_api.rst
127127
sphinxext_plot_directive_api.rst
128128
sphinxext_figmpl_directive_api.rst
129+
sphinxext_roles.rst
129130
spines_api.rst
130131
style_api.rst
131132
table_api.rst

‎doc/api/next_api_changes/behavior/28363-TS.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Subfigures
2+
~~~~~~~~~~
3+
4+
`.Figure.subfigures` are now added in row-major order to be consistent with
5+
`.Figure.subplots`. The return value of `~.Figure.subfigures` is not changed,
6+
but the order of ``fig.subfigs`` is.

‎doc/api/next_api_changes/development/28289-ES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Documentation-specific custom Sphinx roles are now semi-public
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
For third-party packages that derive types from Matplotlib, our use of custom roles may
5+
prevent Sphinx from building their docs. These custom Sphinx roles are now public solely
6+
for the purposes of use within projects that derive from Matplotlib types. See
7+
:mod:`matplotlib.sphinxext.roles` for details.

‎doc/api/sphinxext_roles.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
==============================
2+
``matplotlib.sphinxext.roles``
3+
==============================
4+
5+
.. automodule:: matplotlib.sphinxext.roles
6+
:no-undoc-members:
7+
:private-members: _rcparam_role, _mpltype_role

0 commit comments

Comments
 (0)