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

Skip to content

Commit c2c59e9

Browse files
scottshambaughscottshambaugh
committed
Merge branch 'main' into pan-zoom-3d
2 parents 7ac9f0a + 76a5711 commit c2c59e9

File tree

335 files changed

+5143
-2367
lines changed

Some content is hidden

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

335 files changed

+5143
-2367
lines changed

‎.circleci/config.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,32 @@ commands:
141141
[ "$CIRCLE_PR_NUMBER" = "" ]; then
142142
export RELEASE_TAG='-t release'
143143
fi
144-
make html O="-T $RELEASE_TAG -j4"
144+
make html O="-T $RELEASE_TAG -j4 -w /tmp/sphinxerrorswarnings.log"
145145
rm -r build/html/_sources
146146
working_directory: doc
147147
- save_cache:
148148
key: sphinx-env-v1-{{ .BuildNum }}-{{ .Environment.CIRCLE_JOB }}
149149
paths:
150150
- doc/build/doctrees
151151

152+
doc-show-errors-warnings:
153+
steps:
154+
- run:
155+
name: Extract possible build errors and warnings
156+
command: |
157+
(grep "WARNING\|ERROR" /tmp/sphinxerrorswarnings.log ||
158+
echo "No errors or warnings")
159+
160+
doc-show-deprecations:
161+
steps:
162+
- run:
163+
name: Extract possible deprecation warnings in examples and tutorials
164+
command: |
165+
(grep DeprecationWarning -r -l doc/build/html/gallery ||
166+
echo "No deprecation warnings in gallery")
167+
(grep DeprecationWarning -r -l doc/build/html/tutorials ||
168+
echo "No deprecation warnings in tutorials")
169+
152170
doc-bundle:
153171
steps:
154172
- run:
@@ -186,6 +204,8 @@ jobs:
186204
- doc-deps-install
187205

188206
- doc-build
207+
- doc-show-errors-warnings
208+
- doc-show-deprecations
189209

190210
- doc-bundle
191211

‎.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ per-file-ignores =
113113
examples/user_interfaces/pylab_with_gtk4_sgskip.py: E402
114114
examples/user_interfaces/toolmanager_sgskip.py: E402
115115
examples/userdemo/pgf_preamble_sgskip.py: E402
116+
force-check = True

‎.github/workflows/cibuildwheel.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
fetch-depth: 0
5454

5555
- name: Build wheels for CPython 3.11
56-
uses: pypa/cibuildwheel@v2.9.0
56+
uses: pypa/cibuildwheel@v2.10.2
5757
env:
5858
CIBW_BUILD: "cp311-*"
5959
CIBW_SKIP: "*-musllinux*"
@@ -66,7 +66,7 @@ jobs:
6666
CIBW_ARCHS: ${{ matrix.cibw_archs }}
6767

6868
- name: Build wheels for CPython 3.10
69-
uses: pypa/cibuildwheel@v2.9.0
69+
uses: pypa/cibuildwheel@v2.10.2
7070
env:
7171
CIBW_BUILD: "cp310-*"
7272
CIBW_SKIP: "*-musllinux*"
@@ -79,7 +79,7 @@ jobs:
7979
CIBW_ARCHS: ${{ matrix.cibw_archs }}
8080

8181
- name: Build wheels for CPython 3.9
82-
uses: pypa/cibuildwheel@v2.9.0
82+
uses: pypa/cibuildwheel@v2.10.2
8383
env:
8484
CIBW_BUILD: "cp39-*"
8585
CIBW_SKIP: "*-musllinux*"
@@ -92,7 +92,7 @@ jobs:
9292
CIBW_ARCHS: ${{ matrix.cibw_archs }}
9393

9494
- name: Build wheels for CPython 3.8
95-
uses: pypa/cibuildwheel@v2.9.0
95+
uses: pypa/cibuildwheel@v2.10.2
9696
env:
9797
CIBW_BUILD: "cp38-*"
9898
CIBW_SKIP: "*-musllinux*"
@@ -105,7 +105,7 @@ jobs:
105105
CIBW_ARCHS: ${{ matrix.cibw_archs }}
106106

107107
- name: Build wheels for PyPy
108-
uses: pypa/cibuildwheel@v2.9.0
108+
uses: pypa/cibuildwheel@v2.10.2
109109
env:
110110
CIBW_BUILD: "pp38-* pp39-*"
111111
CIBW_SKIP: "*-musllinux*"

‎.github/workflows/tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
- os: ubuntu-20.04
4949
python-version: '3.10'
5050
extra-requirements: '-r requirements/testing/extra.txt'
51+
- os: ubuntu-20.04
52+
python-version: '3.11.0-rc.1'
5153
- os: macos-latest
5254
python-version: 3.8
5355

@@ -144,10 +146,10 @@ jobs:
144146
~/.cache/matplotlib
145147
!~/.cache/matplotlib/tex.cache
146148
!~/.cache/matplotlib/test_cache
147-
key: 1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
149+
key: 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
148150
restore-keys: |
149-
1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
150-
1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
151+
2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
152+
2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
151153
152154
- name: Install Python dependencies
153155
run: |

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repos:
2828
rev: 4.0.1
2929
hooks:
3030
- id: flake8
31-
additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0]
31+
additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0, flake8-force]
3232
args: ["--docstring-convention=all"]
3333
- repo: https://github.com/codespell-project/codespell
3434
rev: v2.1.0

‎README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ formats and interactive environments across platforms. Matplotlib can be used
5454
in Python scripts, Python/IPython shells, web application servers, and
5555
various graphical user interface toolkits.
5656

57-
5857
Install
5958
=======
6059

61-
For installation instructions and requirements, see the `install documentation
62-
<https://matplotlib.org/stable/users/installing/index.html>`_ or
63-
`installing.rst <doc/users/installing/index.rst>`_ in the source.
60+
See the `install documentation
61+
<https://matplotlib.org/stable/users/installing/index.html>`_, which is
62+
generated from ``/doc/users/installing/index.rst``
6463

6564
Contribute
6665
==========

‎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.6.x | :white_check_mark: |
1112
| 3.5.x | :white_check_mark: |
12-
| 3.4.x | :white_check_mark: |
13+
| 3.4.x | :x: |
1314
| 3.3.x | :x: |
1415
| < 3.3 | :x: |
1516

‎doc/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ clean:
2828
show:
2929
@python -c "import webbrowser; webbrowser.open_new_tab('file://$(shell pwd)/build/html/index.html')"
3030

31+
html-noplot:
32+
$(SPHINXBUILD) -D plot_gallery=0 -b html $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(O)
33+
@echo
34+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
35+
3136
# Catch-all target: route all unknown targets to Sphinx using the new
3237
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
3338
%: Makefile

‎doc/_static/switcher.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
[
22
{
3-
"name": "3.5 (stable)",
3+
"name": "3.6 (stable)",
44
"version": "stable",
5-
"url": "https://matplotlib.org/stable"
5+
"url": "https://matplotlib.org/stable/"
66
},
77
{
8-
"name": "3.6 (dev)",
9-
"version": "devdocs",
10-
"url": "https://matplotlib.org/devdocs"
8+
"name": "3.7 (dev)",
9+
"version": "dev",
10+
"url": "https://matplotlib.org/devdocs/"
11+
},
12+
{
13+
"name": "3.5",
14+
"version": "3.5.3",
15+
"url": "https://matplotlib.org/3.5.3/"
1116
},
1217
{
1318
"name": "3.4",
1419
"version": "3.4.3",
15-
"url": "https://matplotlib.org/3.4.3"
20+
"url": "https://matplotlib.org/3.4.3/"
1621
},
1722
{
1823
"name": "3.3",
1924
"version": "3.3.4",
20-
"url": "https://matplotlib.org/3.3.4"
25+
"url": "https://matplotlib.org/3.3.4/"
2126
},
2227
{
2328
"name": "2.2",
2429
"version": "2.2.4",
25-
"url": "https://matplotlib.org/2.2.4"
30+
"url": "https://matplotlib.org/2.2.4/"
2631
}
2732
]

‎doc/_static/zenodo_cache/7084615.svg

Lines changed: 35 additions & 0 deletions
Loading

‎doc/api/artist_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ Drawing
105105

106106
Artist.get_agg_filter
107107
Artist.get_window_extent
108+
Artist.get_tightbbox
108109
Artist.get_transformed_clip_path_and_affine
109110

110111
Figure and Axes

‎doc/api/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,3 @@ Alphabetical list of modules:
163163
toolkits/mplot3d.rst
164164
toolkits/axes_grid1.rst
165165
toolkits/axisartist.rst
166-
toolkits/axes_grid.rst

‎doc/api/matplotlib_configuration_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Default values and styling
3131
:no-members:
3232

3333
.. automethod:: find_all
34+
.. automethod:: copy
3435

3536
.. autofunction:: rc_context
3637

‎doc/api/next_api_changes/behavior/19214-DS.rst

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

‎doc/api/next_api_changes/behavior/19368-DS.rst

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

‎doc/api/next_api_changes/behavior/20426-JK.rst

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

‎doc/api/next_api_changes/behavior/20715-JKS.rst

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

‎doc/api/next_api_changes/behavior/21026-DS.rst

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

‎doc/api/next_api_changes/behavior/21042-AL.rst

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

‎doc/api/next_api_changes/behavior/21238-AL.rst

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

‎doc/api/next_api_changes/behavior/21983-AL.rst

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

‎doc/api/next_api_changes/behavior/22013-AL.rst

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

‎doc/api/next_api_changes/behavior/22063-SR.rst

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

‎doc/api/next_api_changes/behavior/22204-AL.rst

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

‎doc/api/next_api_changes/behavior/22229-TAC.rst

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

‎doc/api/next_api_changes/behavior/22485-TH.rst

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

‎doc/api/next_api_changes/behavior/22567-IT.rst

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

‎doc/api/next_api_changes/behavior/22639-RA.rst

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

‎doc/api/next_api_changes/behavior/22691-JMK.rst

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

0 commit comments

Comments
 (0)