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
Sign up
Appearance settings

Commit 7be8ccf

Browse files
committed
Merge remote-tracking branch 'upstream/main' into resample_bug
2 parents 427cadc + 716d046 commit 7be8ccf

File tree

135 files changed

+2010
-924
lines changed

Some content is hidden

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

135 files changed

+2010
-924
lines changed

‎.github/workflows/cibuildwheel.yml‎

Lines changed: 21 additions & 17 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
@@ -78,14 +80,16 @@ jobs:
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 }}
@@ -183,7 +187,7 @@ jobs:
183187
if-no-files-found: error
184188

185189
publish:
186-
if: github.event_name == 'push' && github.ref_type == 'tag'
190+
if: github.repository == 'matplotlib/matplotlib' && github.event_name == 'push' && github.ref_type == 'tag'
187191
name: Upload release to PyPI
188192
needs: [build_sdist, build_wheels]
189193
runs-on: ubuntu-latest

‎.github/workflows/circleci.yml‎

Lines changed: 1 addition & 1 deletion
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 }}

‎.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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
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@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
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/reviewdog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414
with:
1515
fetch-depth: 0
16-
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
16+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
1717
with:
1818
python-version: "3.x"
1919
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@ jobs:
6464
python-version: '3.12'
6565
# https://github.com/matplotlib/matplotlib/issues/29844
6666
pygobject-ver: '<3.52.0'
67-
- os: ubuntu-22.04
67+
- name-suffix: "(Extra TeX packages)"
68+
os: ubuntu-22.04
6869
python-version: '3.13'
70+
extra-packages: 'texlive-fonts-extra texlive-lang-cyrillic'
6971
# https://github.com/matplotlib/matplotlib/issues/29844
7072
pygobject-ver: '<3.52.0'
7173
- name-suffix: "Free-threaded"
@@ -142,7 +144,8 @@ jobs:
142144
texlive-latex-recommended \
143145
texlive-luatex \
144146
texlive-pictures \
145-
texlive-xetex
147+
texlive-xetex \
148+
${{ matrix.extra-packages }}
146149
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
147150
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
148151
fi
@@ -396,7 +399,7 @@ jobs:
396399
fi
397400
- name: Upload code coverage
398401
if: ${{ !cancelled() && github.event_name != 'schedule' }}
399-
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
402+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
400403
with:
401404
name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}"
402405
token: ${{ secrets.CODECOV_TOKEN }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exclude: |
1010
doc/devel/gitwash|
1111
doc/users/prev|
1212
doc/api/prev|
13-
lib/matplotlib/tests/tinypages
13+
lib/matplotlib/tests/data/tinypages
1414
)
1515
repos:
1616
- repo: https://github.com/pre-commit/pre-commit-hooks

‎doc/_embedded_plots/grouped_bar.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import matplotlib.pyplot as plt
2+
3+
categories = ['A', 'B']
4+
data0 = [1.0, 3.0]
5+
data1 = [1.4, 3.4]
6+
data2 = [1.8, 3.8]
7+
8+
fig, ax = plt.subplots(figsize=(4, 2.2))
9+
ax.grouped_bar(
10+
[data0, data1, data2],
11+
tick_labels=categories,
12+
labels=['dataset 0', 'dataset 1', 'dataset 2'],
13+
colors=['#1f77b4', '#58a1cf', '#abd0e6'],
14+
)
15+
ax.legend()

‎doc/api/axes_api.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Basic
6767
Axes.bar
6868
Axes.barh
6969
Axes.bar_label
70+
Axes.grouped_bar
7071

7172
Axes.stem
7273
Axes.eventplot

‎doc/api/bezier_api.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
.. automodule:: matplotlib.bezier
66
:members:
77
:undoc-members:
8+
:special-members: __call__
89
:show-inheritance:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /