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

Skip to content

Commit 0962d14

Browse files
devRDdevRD
authored
Merge branch 'matplotlib:main' into tickertex
2 parents d4537da + 75a35e0 commit 0962d14

File tree

857 files changed

+5398
-4180
lines changed

Some content is hidden

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

857 files changed

+5398
-4180
lines changed

‎.appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ branches:
99
- /auto-backport-.*/
1010
- /^v\d+\.\d+\.[\dx]+-doc$/
1111

12+
skip_commits:
13+
message: /\[ci doc\]/
14+
files:
15+
- 'doc/**'
16+
- 'galleries/**'
17+
1218
clone_depth: 50
1319

1420
image: Visual Studio 2017

‎.flake8

Lines changed: 45 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,23 @@
22
max-line-length = 88
33
select =
44
# flake8 default
5-
C90, E, F, W,
6-
# docstring-convention=numpy
7-
D100, D101, D102, D103, D104, D105, D106,
8-
D200, D201, D202, D204, D205, D206, D207, D208,
9-
D209, D210, D211, D214, D215,
10-
D300, D301, D302,
11-
D400, D401, D403, D404, D405, D406, D407, D408,
12-
D409, D410, D411, D412, D414,
13-
# matplotlib-specific extra pydocstyle errors
14-
D213,
5+
D, E, F, W,
156
ignore =
167
# flake8 default
178
E121,E123,E126,E226,E24,E704,W503,W504,
189
# Additional ignores:
1910
E127, E131,
2011
E266,
2112
E305, E306,
22-
E722, E741,
13+
E741,
2314
F841,
24-
# Some new flake8 ignores:
25-
N801, N802, N803, N806, N812,
2615
# pydocstyle
27-
D100, D101, D102, D103, D104, D105, D106, D107,
28-
D200, D202, D203, D204, D205, D207, D212,
16+
D100, D101, D102, D103, D104, D105, D106,
17+
D200, D202, D204, D205,
2918
D301,
30-
D400, D401, D402, D403, D404, D413,
19+
D400, D401, D403, D404
20+
# ignored by pydocstyle numpy docstring convention
21+
D107, D203, D212, D213, D402, D413, D415, D416, D417,
3122

3223
exclude =
3324
.git
@@ -42,7 +33,6 @@ exclude =
4233
per-file-ignores =
4334
setup.py: E402
4435

45-
4636
lib/matplotlib/__init__.py: E402, F401
4737
lib/matplotlib/_animation_data.py: E501
4838
lib/matplotlib/_api/__init__.py: F401
@@ -65,47 +55,43 @@ per-file-ignores =
6555
lib/pylab.py: F401, F403
6656

6757
doc/conf.py: E402
68-
tutorials/advanced/path_tutorial.py: E402
69-
tutorials/advanced/patheffects_guide.py: E402
70-
tutorials/advanced/transforms_tutorial.py: E402, E501
71-
tutorials/colors/colormaps.py: E501
72-
tutorials/colors/colors.py: E402
73-
tutorials/intermediate/artists.py: E402
74-
tutorials/intermediate/constrainedlayout_guide.py: E402
75-
tutorials/intermediate/legend_guide.py: E402
76-
tutorials/intermediate/tight_layout_guide.py: E402
77-
tutorials/introductory/animation_tutorial.py: E501
78-
tutorials/introductory/images.py: E501
79-
tutorials/introductory/pyplot.py: E402, E501
80-
tutorials/text/annotations.py: E402, E501
81-
tutorials/text/mathtext.py: E501
82-
tutorials/text/text_intro.py: E402
83-
tutorials/text/text_props.py: E501
84-
tutorials/text/usetex.py: E501
85-
tutorials/toolkits/axes_grid.py: E501
86-
tutorials/toolkits/axisartist.py: E501
58+
galleries/tutorials/advanced/path_tutorial.py: E402
59+
galleries/tutorials/advanced/patheffects_guide.py: E402
60+
galleries/tutorials/advanced/transforms_tutorial.py: E402, E501
61+
galleries/tutorials/colors/colormaps.py: E501
62+
galleries/tutorials/colors/colors.py: E402
63+
galleries/tutorials/intermediate/artists.py: E402
64+
galleries/tutorials/intermediate/constrainedlayout_guide.py: E402
65+
galleries/tutorials/intermediate/legend_guide.py: E402
66+
galleries/tutorials/intermediate/tight_layout_guide.py: E402
67+
galleries/tutorials/introductory/animation_tutorial.py: E501
68+
galleries/tutorials/introductory/images.py: E501
69+
galleries/tutorials/introductory/pyplot.py: E402, E501
70+
galleries/tutorials/text/annotations.py: E402, E501
71+
galleries/tutorials/text/mathtext.py: E501
72+
galleries/tutorials/text/text_intro.py: E402
73+
galleries/tutorials/text/text_props.py: E501
8774

88-
examples/animation/frame_grabbing_sgskip.py: E402
89-
examples/images_contours_and_fields/tricontour_demo.py: E201
90-
examples/images_contours_and_fields/tripcolor_demo.py: E201
91-
examples/images_contours_and_fields/triplot_demo.py: E201
92-
examples/lines_bars_and_markers/marker_reference.py: E402
93-
examples/misc/print_stdout_sgskip.py: E402
94-
examples/misc/table_demo.py: E201
95-
examples/style_sheets/bmh.py: E501
96-
examples/style_sheets/plot_solarizedlight2.py: E501
97-
examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
98-
examples/text_labels_and_annotations/custom_legends.py: E402
99-
examples/ticks/date_concise_formatter.py: E402
100-
examples/ticks/date_formatters_locators.py: F401
101-
examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
102-
examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
103-
examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
104-
examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
105-
examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
106-
examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
107-
examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
108-
examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
109-
examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
110-
examples/userdemo/pgf_preamble_sgskip.py: E402
75+
galleries/examples/animation/frame_grabbing_sgskip.py: E402
76+
galleries/examples/images_contours_and_fields/tricontour_demo.py: E201
77+
galleries/examples/images_contours_and_fields/tripcolor_demo.py: E201
78+
galleries/examples/images_contours_and_fields/triplot_demo.py: E201
79+
galleries/examples/lines_bars_and_markers/marker_reference.py: E402
80+
galleries/examples/misc/print_stdout_sgskip.py: E402
81+
galleries/examples/misc/table_demo.py: E201
82+
galleries/examples/style_sheets/bmh.py: E501
83+
galleries/examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
84+
galleries/examples/text_labels_and_annotations/custom_legends.py: E402
85+
galleries/examples/ticks/date_concise_formatter.py: E402
86+
galleries/examples/ticks/date_formatters_locators.py: F401
87+
galleries/examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
88+
galleries/examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402
89+
galleries/examples/user_interfaces/embedding_in_gtk4_panzoom_sgskip.py: E402
90+
galleries/examples/user_interfaces/embedding_in_gtk4_sgskip.py: E402
91+
galleries/examples/user_interfaces/gtk3_spreadsheet_sgskip.py: E402
92+
galleries/examples/user_interfaces/gtk4_spreadsheet_sgskip.py: E402
93+
galleries/examples/user_interfaces/mpl_with_glade3_sgskip.py: E402
94+
galleries/examples/user_interfaces/pylab_with_gtk3_sgskip.py: E402
95+
galleries/examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
96+
galleries/examples/userdemo/pgf_preamble_sgskip.py: E402
11197
force-check = True

‎.github/workflows/cibuildsdist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
github.event_name == 'pull_request' && (
2929
(
3030
github.event.action == 'labeled' &&
31-
github.event.label.name == 'Run cibuildwheel'
31+
github.event.label.name == 'CI: Run cibuildwheel'
3232
) ||
33-
contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
33+
contains(github.event.pull_request.labels.*.name, 'CI: Run cibuildwheel')
3434
)
3535
name: Build sdist and wheel on ${{ matrix.os }}
3636
runs-on: ${{ matrix.os }}

‎.github/workflows/cibuildwheel.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
github.event_name == 'pull_request' && (
2929
(
3030
github.event.action == 'labeled' &&
31-
github.event.label.name == 'Run cibuildwheel'
31+
github.event.label.name == 'CI: Run cibuildwheel'
3232
) ||
33-
contains(github.event.pull_request.labels.*.name, 'Run cibuildwheel')
33+
contains(github.event.pull_request.labels.*.name, 'CI: Run cibuildwheel')
3434
)
3535
name: Build wheels on ${{ matrix.os }}
3636
runs-on: ${{ matrix.os }}
@@ -61,6 +61,14 @@ jobs:
6161
with:
6262
fetch-depth: 0
6363

64+
# Something changed somewhere that prevents the downloaded-at-build-time
65+
# licenses from being included in built wheels, so pre-download them so
66+
# that they exist before the build and are included.
67+
- name: Pre-download bundled licenses
68+
run: >
69+
curl -Lo LICENSE/LICENSE_QHULL
70+
https://github.com/qhull/qhull/raw/2020.2/COPYING.txt
71+
6472
- name: Build wheels for CPython 3.11
6573
uses: pypa/[email protected]
6674
env:

‎.github/workflows/cygwin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
(
6565
(
6666
github.event.action == 'labeled' &&
67-
github.event.label.name == 'Run cygwin'
67+
github.event.label.name == 'CI: Run cygwin'
6868
) ||
69-
contains(github.event.pull_request.labels.*.name, 'Run cygwin')
69+
contains(github.event.pull_request.labels.*.name, 'CI: Run cygwin')
7070
)
7171
)
7272
)

‎.github/workflows/stale.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 'Label inactive PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
stale:
8+
if: github.repository == 'matplotlib/matplotlib'
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v7
12+
with:
13+
repo-token: ${{ secrets.GITHUB_TOKEN }}
14+
operations-per-run: 50
15+
stale-pr-message: 'Since this Pull Request has not been updated in 60 days, it has been marked "inactive." This does not mean that it will be closed, though it may be moved to a "Draft" state. This helps maintainers prioritize their reviewing efforts. You can pick the PR back up anytime - please ping us if you need a review or guidance to move the PR forward! If you do not plan on continuing the work, please let us know so that we can either find someone to take the PR over, or close it.'
16+
stale-pr-label: 'inactive'
17+
days-before-pr-stale: 60
18+
days-before-pr-close: -1
19+
stale-issue-message: 'This issue has been marked "inactive" because it has been 365 days since the last comment. If this issue is still present in recent Matplotlib releases, or the feature request is still wanted, please leave a comment and this label will be removed. If there are no updates in another 30 days, this issue will be automatically closed, but you are free to re-open or create a new issue if needed. We value issue reports, and this procedure is meant to help us resurface and prioritize issues that have not been addressed yet, not make them disappear. Thanks for your help!'
20+
stale-issue-label: 'inactive'
21+
days-before-issue-stale: 365
22+
days-before-issue-close: 30
23+
ascending: true
24+
exempt-issue-labels: "keep"
25+
exempt-pr-labels: "keep,status: orphaned PR"

‎.github/workflows/tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ on:
1212
pull_request:
1313
branches-ignore:
1414
- v[0-9]+.[0-9]+.[0-9x]+-doc
15+
paths-ignore:
16+
# Skip running tests if changes are only in documentation directories
17+
- 'doc/**'
18+
- 'galleries/examples/**'
19+
- 'galleries/plot_types/**'
20+
- 'galleries/tutorials/**'
1521
schedule:
1622
# 5:47 UTC on Saturdays
1723
- cron: "47 5 * * 6"

‎.gitignore

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Thumbs.db
5656

5757
# Things specific to this project #
5858
###################################
59-
tutorials/intermediate/CL01.png
60-
tutorials/intermediate/CL02.png
59+
galleries/tutorials/intermediate/CL01.png
60+
galleries/tutorials/intermediate/CL02.png
6161

6262
# Documentation generated files #
6363
#################################
@@ -72,14 +72,12 @@ doc/plot_types
7272
doc/pyplots/tex_demo.png
7373
doc/tutorials
7474
lib/dateutil
75-
examples/*/*.bmp
76-
examples/*/*.eps
77-
examples/*/*.pdf
78-
examples/*/*.png
79-
examples/*/*.svg
80-
examples/*/*.svgz
81-
examples/tests/*
82-
!examples/tests/backend_driver_sgskip.py
75+
galleries/examples/*/*.bmp
76+
galleries/examples/*/*.eps
77+
galleries/examples/*/*.pdf
78+
galleries/examples/*/*.png
79+
galleries/examples/*/*.svg
80+
galleries/examples/*/*.svgz
8381
result_images
8482
doc/_static/constrained_layout*.png
8583
doc/.mpl_skip_subdirs.yaml

‎.lgtm.yml

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

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ repos:
4747
hooks:
4848
- id: isort
4949
name: isort (python)
50-
files: ^tutorials/|^examples/
50+
files: ^galleries/tutorials/|^galleries/examples/|^galleries/plot_types/

‎README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ which is generated from `/doc/users/installing/index.rst`
3434

3535
## Contribute
3636

37-
You've discovered a bug or something else you want to change -
38-
excellent!
37+
You've discovered a bug or something else you want to change — excellent!
3938

40-
You've worked out a way to fix it -- even better!
39+
You've worked out a way to fix it — even better!
4140

42-
You want to tell us about it -- best of all!
41+
You want to tell us about it — best of all!
4342

4443
Start at the [contributing
4544
guide](https://matplotlib.org/devdocs/devel/contributing.html)!

‎SECURITY.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ versions.
88

99
| Version | Supported |
1010
| ------- | ------------------ |
11+
| 3.7.x | :white_check_mark: |
1112
| 3.6.x | :white_check_mark: |
12-
| 3.5.x | :white_check_mark: |
13+
| 3.5.x | :x: |
1314
| 3.4.x | :x: |
1415
| 3.3.x | :x: |
1516
| < 3.3 | :x: |

‎doc/_static/switcher.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
[
22
{
3-
"name": "3.6 (stable)",
3+
"name": "3.7 (stable)",
44
"version": "stable",
55
"url": "https://matplotlib.org/stable/"
66
},
77
{
8-
"name": "3.7 (dev)",
8+
"name": "3.8 (dev)",
99
"version": "dev",
1010
"url": "https://matplotlib.org/devdocs/"
1111
},
12+
{
13+
"name": "3.6",
14+
"version": "3.6.3",
15+
"url": "https://matplotlib.org/3.6.3/"
16+
},
1217
{
1318
"name": "3.5",
1419
"version": "3.5.3",

‎doc/_static/zenodo_cache/7162185.svg

Lines changed: 35 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)