Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 38a1453

Browse files
sanrishisanrishi
authored
Merge branch 'main' into fix-twinx-zorder-31122
2 parents 0287455 + 809ad23 commit 38a1453

94 files changed

Lines changed: 883 additions & 356 deletions

File tree

Some content is hidden

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

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ commands:
103103
- run:
104104
name: Install Python dependencies
105105
command: |
106-
python -m pip install --user -r requirements/dev/build-requirements.txt
106+
python -m pip install --user --group build
107107
python -m pip install --user \
108108
numpy<< parameters.numpy_version >> \
109-
-r requirements/doc/doc-requirements.txt
109+
--group doc
110110
python -m pip install --no-deps --user \
111111
git+https://github.com/matplotlib/mpl-sphinx-theme.git
112112

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ updates:
99
actions:
1010
patterns:
1111
- "*"
12+
- package-ecosystem: "pip"
13+
directory: "/"
14+
schedule:
15+
interval: "weekly"
16+
exclude-paths:
17+
- "ci/minver-requirements.txt"

‎.github/workflows/autoclose_comment.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ jobs:
5555
To increase the chance of a productive review:
5656
5757
- Use [the template provided in the PR
58-
description](https://github.com/matplotlib/matplotlib/blob/main/.github/PULL_REQUEST_TEMPLATE.md)
59-
and fill it out as completely as possible, especially the summary
60-
and AI Disclosure sections.
58+
description](https://github.com/matplotlib/matplotlib/blob/main/.github/PULL_REQUEST_TEMPLATE.md)
59+
and fill it out as completely as possible, especially the summary and AI Disclosure sections.
6160
62-
- Make sure your PR conforms to our
63-
[PR checklist](https://matplotlib.org/devdocs/devel/pr_guide.html#summary-for-pull-request-authors).
61+
- Make sure your PR conforms to our [PR
62+
checklist](https://matplotlib.org/devdocs/devel/pr_guide.html#summary-for-pull-request-authors).
6463
6564
6665
As the author, you are responsible for driving this PR, which entails doing
@@ -75,7 +74,7 @@ jobs:
7574
7675
7776
If you substantially improve this PR within two weeks, leave a comment
78-
and a team member may remove the `status: needs work` label and the
77+
and a team member may remove the `status: autoclose candidate` label and the
7978
PR stays open. Cosmetic changes or incomplete fixes will not be
8079
sufficient. Maintainers will assess improvements on their own
8180
schedule. Please do not ping (`@`) maintainers.

‎.github/workflows/autoclose_schedule.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
name: autoclose labeled PRs
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v5
26-
- uses: actions/setup-python@v6
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2727
with:
2828
python-version: '3.13'
2929
- name: Install PyGithub
3030
run: pip install -Uq PyGithub
3131

3232
- name: Checkout repository
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434

3535
- name: Close PRs labeled more than 14 days ago
3636
run: |

‎.github/workflows/cibuildwheel.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140

141141
steps:
142142
- name: Download sdist
143-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
143+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
144144
with:
145145
name: cibw-sdist
146146
path: dist/

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
37+
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
3838
with:
3939
languages: ${{ matrix.language }}
4040

@@ -45,4 +45,4 @@ jobs:
4545
pip install --user -v .
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
48+
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1

‎.github/workflows/cygwin.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,21 @@ jobs:
141141
# FreeType build fails with bash, succeeds with dash
142142

143143
- name: Cache pip
144-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
144+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
145145
with:
146146
path: C:\cygwin\home\runneradmin\.cache\pip
147-
key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
147+
key: Cygwin-py3.${{ matrix.python-minor-version }}-pip-${{ hashFiles('pyproject.toml') }}
148148
restore-keys: ${{ matrix.os }}-py3.${{ matrix.python-minor-version }}-pip-
149149

150150
- name: Cache ccache
151-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
151+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
152152
with:
153153
path: C:\cygwin\home\runneradmin\.ccache
154154
key: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-${{ hashFiles('src/*') }}
155155
restore-keys: Cygwin-py3.${{ matrix.python-minor-version }}-ccache-
156156

157157
- name: Cache Matplotlib
158-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
158+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
159159
with:
160160
path: |
161161
C:\cygwin\home\runneradmin\.cache\matplotlib
@@ -175,15 +175,9 @@ jobs:
175175
- name: Install Python dependencies
176176
shell: bash.exe -eo pipefail -o igncr "{0}"
177177
run: |
178-
python -m pip install --upgrade pip setuptools wheel
179-
python -m pip install kiwisolver 'numpy>=1.22,<1.26' pillow importlib_resources
180-
grep -v -F -e psutil requirements/testing/all.txt >requirements_test.txt
181-
python -m pip install meson-python pybind11
178+
python -m pip install --group build 'numpy>=1.25,<1.26'
182179
export PATH="/usr/local/bin:$PATH"
183-
python -m pip install --no-build-isolation 'contourpy>=1.0.1'
184-
python -m pip install --upgrade cycler fonttools \
185-
packaging pyparsing python-dateutil setuptools-scm \
186-
-r requirements_test.txt sphinx ipython
180+
python -m pip install --upgrade --group test sphinx ipython
187181
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
188182
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
189183
echo 'PyGObject is available' ||

‎.github/workflows/linting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
1919
with:
2020
python-version: "3.x"
21-
- uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
21+
- uses: j178/prek-action@79f765515bd648eb4d6bb1b17277b7cb22cb6468 # v2.0.0
2222
with:
2323
extra_args: --hook-stage manual --all-files
2424

@@ -69,7 +69,7 @@ jobs:
6969
python-version: '3.11'
7070

7171
- name: Install mypy
72-
run: pip3 install -r requirements/testing/mypy.txt -r requirements/testing/all.txt
72+
run: pip3 install --group build --group typing
7373

7474
- name: Set up reviewdog
7575
uses: reviewdog/action-setup@d8a7baabd7f3e8544ee4dbde3ee41d0011c3a93f # v1.5.0

‎.github/workflows/tests.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
- name-suffix: "(Minimum Versions)"
5353
os: ubuntu-22.04
5454
python-version: '3.11'
55-
extra-requirements: '-c requirements/testing/minver.txt'
55+
extra-requirements: '-c ci/minver-requirements.txt'
5656
delete-font-cache: true
5757
# https://github.com/matplotlib/matplotlib/issues/29844
5858
pygobject-ver: '<3.52.0'
5959
- os: ubuntu-22.04
6060
python-version: '3.11'
6161
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
62-
extra-requirements: '-r requirements/testing/extra.txt'
62+
extra-requirements: '--group test-extra'
6363
# https://github.com/matplotlib/matplotlib/issues/29844
6464
pygobject-ver: '<3.52.0'
6565
- name-suffix: "(Extra TeX packages)"
@@ -186,31 +186,33 @@ jobs:
186186
esac
187187
188188
- name: Cache pip
189-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
189+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
190190
if: startsWith(runner.os, 'Linux')
191191
with:
192192
path: ~/.cache/pip
193-
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
193+
key: |
194+
${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{
195+
hashFiles('pyproject.toml', 'ci/minver-requirements.txt') }}
194196
restore-keys: |
195197
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
196198
- name: Cache pip
197-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
199+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
198200
if: startsWith(runner.os, 'macOS')
199201
with:
200202
path: ~/Library/Caches/pip
201-
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('requirements/*/*.txt') }}
203+
key: ${{ matrix.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }}
202204
restore-keys: |
203205
${{ matrix.os }}-py${{ matrix.python-version }}-pip-
204206
- name: Cache ccache
205-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
207+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
206208
with:
207209
path: |
208210
~/.ccache
209211
key: ${{ matrix.os }}-py${{ matrix.python-version }}-ccache-${{ hashFiles('src/*') }}
210212
restore-keys: |
211213
${{ matrix.os }}-py${{ matrix.python-version }}-ccache-
212214
- name: Cache Matplotlib
213-
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
215+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
214216
with:
215217
path: |
216218
~/.cache/matplotlib
@@ -235,12 +237,8 @@ jobs:
235237
236238
# Install dependencies from PyPI.
237239
# Preinstall build requirements to enable no-build-isolation builds.
238-
python -m pip install --upgrade $PRE \
239-
'contourpy>=1.0.1' cycler fonttools kiwisolver importlib_resources \
240-
packaging pillow 'pyparsing!=3.1.0' python-dateutil setuptools-scm \
241-
'meson-python>=0.13.1' 'pybind11>=2.13.2' \
242-
-r requirements/testing/all.txt \
243-
${{ matrix.extra-requirements }}
240+
python -m pip install --upgrade $PRE --prefer-binary \
241+
--group build --group test ${{ matrix.extra-requirements }}
244242
245243
# Install optional dependencies from PyPI.
246244
# Sphinx is needed to run sphinxext tests
@@ -397,7 +395,7 @@ jobs:
397395
fi
398396
- name: Upload code coverage
399397
if: ${{ !cancelled() && github.event_name != 'schedule' }}
400-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
398+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
401399
with:
402400
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}"
403401
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/wasm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
runs-on: ubuntu-24.04
4040

4141
steps:
42-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4343
with:
4444
fetch-depth: 0
4545
persist-credentials: false
4646

47-
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
47+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4848
name: Install Python
4949
with:
5050
python-version: '3.13'
@@ -55,7 +55,7 @@ jobs:
5555
CIBW_BUILD: "cp312-*"
5656
CIBW_PLATFORM: "pyodide"
5757

58-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
58+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5959
with:
6060
name: cibw-wheels-wasm
6161
path: ./wheelhouse/*.whl

0 commit comments

Comments
 (0)