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

Skip to content

Commit 18bda2e

Browse files
scottshambaughscottshambaugh
committed
Merge branch 'main' into rotate-3d-plot-gallery
2 parents 01042d6 + 73304d2 commit 18bda2e

File tree

151 files changed

+3944
-2036
lines changed

Some content is hidden

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

151 files changed

+3944
-2036
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
name: Bug Report
2-
description: Report a bug or issue with Matplotlib
2+
description: Report a bug or issue with Matplotlib.
33
title: "[Bug]: "
44
body:
5-
- type: markdown
6-
attributes:
7-
value: |
8-
To help us understand and resolve your issue, please fill out the form to the best of your ability.
95
- type: textarea
106
id: summary
117
attributes:
128
label: Bug summary
13-
description: Please provide 1-2 short sentences that succinctly describes the bug
9+
description: Describe the bug in 1-2 short sentences
1410
placeholder:
1511
value:
1612
validations:
@@ -28,63 +24,62 @@ body:
2824
id: actual
2925
attributes:
3026
label: Actual outcome
31-
description: Please provide the output produced by the above code, which may be a screenshot, console output, etc.
32-
placeholder: if applicable, paste the console output and images here
27+
description: |
28+
Paste the output produced by the code provided above, e.g.
29+
console output, images/videos produced by the code, any relevant screenshots/screencasts, etc.
3330
validations:
3431
required: true
3532
- type: textarea
3633
id: expected
3734
attributes:
3835
label: Expected outcome
39-
description: Please provide a description (or visual example) of the expected outcome from the code snippet. If this used to work in an earlier version of Matplotlib, please note the version it used to work on
36+
description: Describe (or provide a visual example of) the expected outcome from the code snippet.
4037
validations:
4138
required: true
39+
- type: textarea
40+
id: details
41+
attributes:
42+
label: Additional information
43+
description: |
44+
- What are the conditions under which this bug happens? input parameters, edge cases, etc?
45+
- Has this worked in earlier versions?
46+
- Do you know why this bug is happening?
47+
- Do you maybe even know a fix?
4248
- type: input
4349
id: operating-system
4450
attributes:
4551
label: Operating system
46-
description: What operating system are you using?
47-
placeholder: Windows, OS/X, Arch, Debian, Ubuntu, etc.
52+
description: Windows, OS/X, Arch, Debian, Ubuntu, etc.
4853
- type: input
4954
id: matplotlib-version
5055
attributes:
5156
label: Matplotlib Version
52-
placeholder: import matplotlib; print(matplotlib.__version__)
57+
description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
5358
validations:
5459
required: true
5560
- type: input
5661
id: matplotlib-backend
5762
attributes:
5863
label: Matplotlib Backend
59-
placeholder: print(matplotlib.get_backend())
64+
description: "From Python prompt: `import matplotlib; print(matplotlib.get_backend())`"
6065
- type: input
6166
id: python-version
6267
attributes:
6368
label: Python version
64-
placeholder: python --version
69+
description: "In console: `python --version`"
6570
- type: input
6671
id: jupyter-version
6772
attributes:
6873
label: Jupyter version
69-
placeholder: jupyter notebook --version, jupyter lab --version
70-
- type: textarea
71-
id: other-libraries
72-
attributes:
73-
label: Other libraries
74-
description: please provide the versions of any other libraries that are relevant to this bug report.
74+
description: "In console: `jupyter notebook --version` or `jupyter lab --version`"
7575
- type: dropdown
7676
id: install
7777
attributes:
7878
label: Installation
79-
description: how did you install matplotlib?
79+
description: How did you install matplotlib?
8080
options:
8181
- pip
8282
- conda
83-
- Linux package manager (Debian/Fedora/etc.)
84-
- source
85-
- type: input
86-
id: conda-channel
87-
attributes:
88-
label: Conda channel
89-
description: If you installed from conda, please specify which channel you used if not the default?
90-
placeholder: conda-forge
83+
- Linux package manager
84+
- from source (.tar.gz)
85+
- git checkout

‎.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ description: Create a report to help us improve the documentation
33
title: "[Doc]: "
44
labels: [Documentation]
55
body:
6-
- type: markdown
7-
attributes:
8-
value: |
9-
To help us understand and resolve your issue, please fill out the form to the best of your ability.
106
- type: input
117
id: link
128
attributes:
139
label: Documentation Link
14-
description: Please provide a link to any documentation or examples that you are referencing.
15-
placeholder: https://matplotlib.org/devdocs/
10+
description: |
11+
Link to any documentation or examples that you are referencing.
12+
Suggested improvements should be based on the development version of the docs: https://matplotlib.org/devdocs/
13+
placeholder: https://matplotlib.org/devdocs/...
1614
- type: textarea
1715
id: problem
1816
attributes:
@@ -28,7 +26,6 @@ body:
2826
id: improvement
2927
attributes:
3028
label: Suggested improvement
31-
description: How can we improve the documentation?
3229
placeholder: |
3330
* This line should be be changed to say [...]
3431
* Include a paragraph explaining [...]
@@ -37,15 +34,6 @@ body:
3734
id: matplotlib-version
3835
attributes:
3936
label: Matplotlib Version
40-
placeholder: import matplotlib; print(matplotlib.__version__)
41-
validations:
42-
required: true
43-
- type: input
44-
id: matplotlib-doc-version
45-
attributes:
46-
label: Matplotlib documentation version
47-
placeholder: check under the logo
37+
description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
4838
validations:
4939
required: true
50-
51-

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
Thanks for thinking of a way to improve Matplotlib. Please search the issues for relevant feature requests before creating a new feature request.
9+
Please search the [issues](https://github.com/matplotlib/matplotlib/issues) for relevant feature requests before creating a new feature request.
1010
- type: textarea
1111
id: problem
1212
attributes:
1313
label: Problem
14-
description: Please provide a clear and concise description of the problem this feature will solve.
14+
description: Briefly describe the problem this feature will solve. (2-4 sentences)
1515
placeholder: |
1616
* I'm always frustrated when [...] because [...]
1717
* I would like it if [...] happened when I [...] because [...]
@@ -22,15 +22,4 @@ body:
2222
id: solution
2323
attributes:
2424
label: Proposed solution
25-
description: Please provide a clear and concise description of a way to accomplish what you want.
26-
placeholder: Add an option so that when [...] [...] will happen
27-
- type: textarea
28-
id: prior-art
29-
attributes:
30-
label: Additional context and prior art
31-
description: Add any other context or screenshots about the feature request here. You can also include links to examples of other programs that have something similar to your request.
32-
placeholder: Another project [...] solved this by [...]
33-
34-
35-
36-
25+
description: Describe a way to accomplish the goals of this feature request.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
## PR Checklist
44

55
<!-- Please mark any checkboxes that do not apply to this PR as [N/A]. -->
6-
6+
**Tests and Styling**
77
- [ ] Has pytest style unit tests (and `pytest` passes).
8-
- [ ] Is [Flake 8](https://flake8.pycqa.org/en/latest/) compliant (run `flake8` on changed files to check).
8+
- [ ] Is [Flake 8](https://flake8.pycqa.org/en/latest/) compliant (install `flake8-docstrings` and run `flake8 --docstring-convention=all`).
9+
10+
**Documentation**
911
- [ ] New features are documented, with examples if plot related.
10-
- [ ] Documentation is sphinx and numpydoc compliant (the docs should [build](https://matplotlib.org/devel/documenting_mpl.html#building-the-docs) without error).
11-
- [ ] Conforms to Matplotlib style conventions (install `flake8-docstrings` and run `flake8 --docstring-convention=all`).
1212
- [ ] New features have an entry in `doc/users/next_whats_new/` (follow instructions in README.rst there).
1313
- [ ] API changes documented in `doc/api/next_api_changes/` (follow instructions in README.rst there).
14+
- [ ] Documentation is sphinx and numpydoc compliant (the docs should [build](https://matplotlib.org/devel/documenting_mpl.html#building-the-docs) without error).
1415

1516
<!--
1617
Thank you so much for your PR! To help us review your contribution, please

‎.github/workflows/cibuildwheel.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ jobs:
6464
- name: Build wheels for CPython 3.10
6565
run: |
6666
python -m cibuildwheel --output-dir dist
67-
if: matrix.os != 'macos-10.15'
6867
env:
6968
CIBW_BUILD: "cp310-*"
7069
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
7170
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
72-
CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.2
71+
CIBW_BEFORE_BUILD: pip install certifi numpy==1.21.3
7372
MPL_DISABLE_FH4: "yes"
7473
CIBW_ARCHS: ${{ matrix.cibw_archs }}
7574

‎.github/workflows/circleci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
repo-token: ${{ secrets.GITHUB_TOKEN }}
1111
artifact-path: 0/doc/build/html/index.html
1212
circleci-jobs: docs-python38
13-
job-title: Check the rendered docs here!
13+
job-title: View the built docs

‎.github/workflows/clean_pr.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,14 @@ jobs:
1919
printf 'The following files were both added and deleted in this PR:\n%s\n' "$ad"
2020
exit 1
2121
fi
22-
22+
- name: Check for added-and-modified images
23+
run: |
24+
git fetch --quiet origin "$GITHUB_BASE_REF"
25+
base="$(git merge-base "origin/$GITHUB_BASE_REF" 'HEAD^2')"
26+
am="$(git log "$base..HEAD^2" --pretty=tformat: --name-status --diff-filter=AM |
27+
cut --fields 2 | sort | uniq --repeated |
28+
grep -E '.(png|pdf|ps|eps|svg)' || true)"
29+
if [[ -n "$am" ]]; then
30+
printf 'The following images were both added and modified in this PR:\n%s\n' "$am"
31+
exit 1
32+
fi

‎.github/workflows/pr_welcome.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/first-interaction@v1
1111
with:
12+
add-labels: "status: needs workflow approval"
1213
repo-token: ${{ secrets.GITHUB_TOKEN }}
1314
pr-message: >+
1415
Thank you for opening your first PR into Matplotlib!

‎.github/workflows/tests.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414

1515
jobs:
1616
test:
17+
if: "github.repository == 'matplotlib/matplotlib' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
1718
name: "Python ${{ matrix.python-version }} on ${{ matrix.os }} ${{ matrix.name-suffix }}"
1819
runs-on: ${{ matrix.os }}
1920

@@ -225,6 +226,13 @@ jobs:
225226
fi
226227
fi
227228
229+
cat <<EOT >> mplsetup.cfg
230+
[rc_options]
231+
backend=Agg
232+
EOT
233+
234+
cat mplsetup.cfg
235+
228236
# All dependencies must have been pre-installed, so that the minver
229237
# constraints are held.
230238
python -m pip install --no-deps -e .
@@ -242,7 +250,7 @@ jobs:
242250
run: |
243251
${{ matrix.XVFB_RUN }} python -mpytest -raR -n auto \
244252
--maxfail=50 --timeout=300 --durations=25 \
245-
--cov-report=xml --cov=lib --log-level=DEBUG
253+
--cov-report=xml --cov=lib --log-level=DEBUG --color=yes
246254
247255
- name: Filter C coverage
248256
run: |

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Citing Matplotlib
9898
If Matplotlib contributes to a project that leads to publication, please
9999
acknowledge this by citing Matplotlib.
100100

101-
`A ready-made citation entry <https://matplotlib.org/stable/citing.html>`_ is
101+
`A ready-made citation entry <https://matplotlib.org/stable/users/project/citing.html>`_ is
102102
available.
103103

104104
Research notice

‎SECURITY.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,23 @@ versions.
88

99
| Version | Supported |
1010
| ------- | ------------------ |
11-
| 3.3.x | :white_check_mark: |
12-
| 3.2.x | :white_check_mark: |
13-
| 3.1.x | :x: |
14-
| 3.0.x | :x: |
15-
| 2.2.x | :white_check_mark: |
16-
| < 2.2 | :x: |
11+
| 3.5.x | :white_check_mark: |
12+
| 3.4.x | :white_check_mark: |
13+
| 3.3.x | :x: |
14+
| < 3.3 | :x: |
15+
1716

1817
## Reporting a Vulnerability
1918

20-
If you have found a security vulnerability, in order to keep it confidential,
19+
If you have found a security vulnerability, in order to keep it confidential,
2120
please do not report an issue on GitHub.
2221

23-
Please email us details of the vulnerability at [email protected];
22+
Please email us details of the vulnerability at [email protected];
2423
include a description and proof-of-concept that is [short and
2524
self-contained](http://www.sscce.org/).
2625

27-
You should expect a response within a week of your email. Depending on the
26+
You should expect a response within a week of your email. Depending on the
2827
severity of the issue, this may require some time to draft an immediate bugfix
2928
release. Less severe issues may be held until the next release.
3029

31-
We do not award bounties for security vulnerabilities.
30+
We do not award bounties for security vulnerabilities.

‎doc/_static/mpl.css

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ does not float with it.
204204
*/
205205
.sphx-glr-thumbcontainer p.caption:hover > a.headerlink{
206206
visibility: hidden;
207-
208207
}
209208

210209
/* slightly reduce horizontal margin compared to gallery.css to
@@ -218,6 +217,26 @@ does not float with it.
218217
padding: 0;
219218
}
220219

220+
/* hide note linking to the download section at the bottom of galleries
221+
* as suggested in https://github.com/sphinx-gallery/sphinx-gallery/issues/760
222+
*/
223+
div.sphx-glr-download-link-note {
224+
height: 0px;
225+
visibility: hidden;
226+
}
227+
228+
/* re-style the download button */
229+
div.sphx-glr-download a {
230+
background-color: #E3F0F6;
231+
background-image: none;
232+
color: #11557c;
233+
border: 0;
234+
}
235+
236+
div.sphx-glr-download a:hover {
237+
background-color: #BCD4DF;
238+
}
239+
221240
table.property-table th,
222241
table.property-table td {
223242
padding: 4px 10px;
@@ -245,3 +264,11 @@ div.twocol > div {
245264
padding: 0;
246265
margin: 0;
247266
}
267+
268+
/* Fix selection of parameter names; remove when fixed in the theme
269+
* https://github.com/sphinx-doc/sphinx/pull/9763
270+
*/
271+
.classifier:before {
272+
display: inline-block;
273+
margin: 0 0.5em;
274+
}

‎doc/_templates/cheatsheet_sidebar.html

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

22
<div class="sidebar-cheatsheets">
33
<h3>Matplotlib cheatsheets</h3>
4-
<a href="https://github.com/matplotlib/cheatsheets#cheatsheets">
4+
<a href="https://matplotlib.org/cheatsheets/">
55
<img src="_static/mpl_cheatsheet1.png"
66
alt="Matplotlib cheatsheets"
77
srcset="_static/mpl_cheatsheet1.png 1x, _static/mpl_cheatsheet1_2x.png 2x"/>

‎doc/_templates/mpl_nav_bar.html

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

0 commit comments

Comments
 (0)