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

Commit 0e01b31

Browse filesBrowse files
stanleyjsstanleyjs
authored
Merge branch 'main' into subfigure-clear
2 parents 8a30509 + 541a786 commit 0e01b31
Copy full SHA for 0e01b31

File tree

Expand file treeCollapse file tree

102 files changed

+1774
-1468
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

102 files changed

+1774
-1468
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ environment:
1818
PYTHONIOENCODING: UTF-8
1919
PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
2020
--cov-report= --cov=lib --log-level=DEBUG
21-
PINNEDVERS: "pyzmq!=21.0.0 pyzmq!=22.0.0"
21+
PINNEDVERS: "pyzmq!=21.0.0,!=22.0.0"
2222

2323
matrix:
2424
# In theory we could use a single CONDA_INSTALL_LOCN because we construct
@@ -55,7 +55,7 @@ install:
5555
- conda config --prepend channels conda-forge
5656

5757
# For building, use a new environment
58-
- conda create -q -n test-environment python=%PYTHON_VERSION% tk
58+
- conda create -q -n test-environment python=%PYTHON_VERSION% tk "pip<22.0"
5959
- activate test-environment
6060
# pull pywin32 from conda because on py38 there is something wrong with finding
6161
# the dlls when insalled from pip

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ commands:
8585
command: |
8686
python -m pip install --upgrade --user pip
8787
python -m pip install --upgrade --user wheel
88-
python -m pip install --upgrade --user setuptools
88+
python -m pip install --upgrade --user 'setuptools!=60.6.0'
8989
9090
deps-install:
9191
parameters:

‎.github/ISSUE_TEMPLATE/documentation.yml

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/documentation.yml
-7Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,3 @@ body:
3030
* This line should be be changed to say [...]
3131
* Include a paragraph explaining [...]
3232
* Add a figure showing [...]
33-
- type: input
34-
id: matplotlib-version
35-
attributes:
36-
label: Matplotlib Version
37-
description: "From Python prompt: `import matplotlib; print(matplotlib.__version__)`"
38-
validations:
39-
required: true

‎.pre-commit-config.yaml

Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
ci:
2+
autofix_prs: false
3+
autoupdate_schedule: 'quarterly'
4+
exclude: |
5+
(?x)^(
6+
extern|
7+
lib/matplotlib/mpl-data|
8+
doc/devel/gitwash|
9+
doc/users/prev|
10+
doc/api/prev|
11+
lib/matplotlib/tests/tinypages
12+
)
13+
repos:
14+
- repo: https://github.com/pre-commit/pre-commit-hooks
15+
rev: v4.0.1
16+
hooks:
17+
- id: check-added-large-files
18+
- id: check-docstring-first
19+
- id: end-of-file-fixer
20+
exclude_types: [svg]
21+
- id: mixed-line-ending
22+
- id: trailing-whitespace
23+
exclude_types: [svg]
24+
- repo: https://github.com/pycqa/flake8
25+
rev: 3.9.2
26+
hooks:
27+
- id: flake8
28+
additional_dependencies: [pydocstyle>5.1.0, flake8-docstrings>1.4.0]
29+
args: ["--docstring-convention=all"]

‎README.rst

Copy file name to clipboardExpand all lines: README.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Check out our `home page <https://matplotlib.org/>`_ for more information.
5151

5252
Matplotlib produces publication-quality figures in a variety of hardcopy
5353
formats and interactive environments across platforms. Matplotlib can be used
54-
in Python scripts, the Python and IPython shell, web application servers, and
54+
in Python scripts, Python/IPython shells, web application servers, and
5555
various graphical user interface toolkits.
5656

5757

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

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Improved autoscaling for bezier curves
2+
--------------------------------------
3+
Bezier curves are now autoscaled to their extents - previously they were
4+
autoscaled to their ends and control points, which in some cases led to
5+
unnecessarily large limits.

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

Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Large ``imshow`` images are now downsampled
2+
-------------------------------------------
3+
When showing an image using `~matplotlib.axes.Axes.imshow` that has more than
4+
:math:`2^{24}` columns or :math:`2^{23}` rows, the image will now be downsampled
5+
to below this resolution before being resampled for display by the AGG renderer.
6+
Previously such a large image would be shown incorrectly. To prevent this
7+
downsampling and the warning it raises, manually downsample your data before
8+
handing it to `~matplotlib.axes.Axes.imshow`

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

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
``CallbackRegistry`` raises on unknown signals
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
When Matplotlib instantiates a `.CallbackRegistry`, it now limits callbacks
4+
to the signals that the registry knows about. In practice, this means that
5+
calling `~.FigureCanvasBase.mpl_connect` with an invalid signal name now raises
6+
a `ValueError`.

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

Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
AritistList proxies copy contents on iteration
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
When iterating over the contents of the the dynamically generated proxy lists
5+
for the Artist-type accessors (see :ref:`Behavioural API Changes 3.5 - Axes
6+
children combined`), a copy of the contents is made. This ensure that artists
7+
can safely be added or removed from the Axes while iterating over their children.
8+
9+
This is a departure from the expected behavior of mutable iterable data types
10+
in Python -- iterating over list while mutating it has surprising consequences
11+
and dictionaries will error if they change size during iteration.
12+
Because all of the accessors are filtered views of the same underlying list, it
13+
is possible for seemingly unrelated changes, such as removing a Line, to affect
14+
the iteration over any of the other accessors. In this case, we have opted to
15+
make a copy of the relevant children before yielding them to the user.
16+
17+
This change is also consistent with our plan to make these accessors immutable
18+
in Matplotlib 3.7.

‎doc/api/next_api_changes/deprecations/21962-AL.rst

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
``backend_pgf``
2+
~~~~~~~~~~~~~~~
3+
The following API elements have been deprecated with no
4+
replacement: ``NO_ESCAPE``, ``re_mathsep``, ``get_fontspec``, ``get_preamble``,
5+
``common_texification``, ``writeln``.

‎doc/api/next_api_changes/deprecations/22025-AL.rst

Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
``FigureFrameWx`` attributes and methods
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
- ``sizer`` is deprecated (use ``frame.GetSizer()`` instead).
4+
- ``figmgr`` and ``get_figure_manager`` are deprecated (use
5+
``frame.canvas.manager`` instead).
6+
- ``num`` is deprecated (use ``frame.canvas.manager.num`` instead).
7+
- ``toolbar`` is deprecated (use ``frame.GetToolBar()``
8+
instead).
9+
- ``toolmanager`` is deprecated (use ``frame.canvas.manager.toolmanager``
10+
instead).
11+
12+
``RendererWx.offset_text_height``
13+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14+
... is deprecated.

‎doc/api/next_api_changes/deprecations/22268-OG.rst

Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
``ticker`` functions deprecated
2+
-------------------------------
3+
4+
The functions ``matplotlib.ticker.is_decade`` and
5+
``matplotlib.ticker.is_close_to_int`` are considered internal and public access
6+
is deprecated.
7+
8+
For ``is_close_to_int`` use ``math.isclose(x, round(x))`` instead.
9+
For ``is_decade`` use
10+
``y = numpy.log(x)/numpy.log(base); numpy.isclose(y, numpy.round(y))``

‎doc/api/next_api_changes/deprecations/22323-GL.rst

Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``matplotlib.cbook.maxdict`` is deprecated
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
This class has been deprecated in favor of the standard library
4+
``functools.lru_cache``.

‎doc/api/next_api_changes/deprecations/22345-JK.rst

Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Pending deprecation of layout methods
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
The methods `~.Figure.set_tight_layout`, `~.Figure.set_constrained_layout`,
4+
are discouraged, and now emit a ``PendingDeprecationWarning`` in favor of
5+
explicitly referencing the layout engine via
6+
``figure.set_layout_engine('tight')`` and
7+
``figure.set_layout_engine('constrained')``. End users should not see the
8+
warning, but library authors should adjust.
9+
10+
The methods `~.Figure.set_constrained_layout_pads` and
11+
`~.Figure.get_constrained_layout_pads` are will be deprecated in favor of
12+
``figure.get_layout_engine().set()`` and
13+
``figure.get_layout_engine().get()``, and currently emit a
14+
``PendingDeprecationWarning``.

‎doc/api/next_api_changes/removals/22365-OG.rst

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Removal of deprecated ``MovieWriter.cleanup``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
The cleanup logic is instead fully implemented in `.MovieWriter.finish` and
5+
``cleanup`` is no longer called.

‎doc/conf.py

Copy file name to clipboardExpand all lines: doc/conf.py
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ def _check_dependencies():
160160
'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
161161
'pytest': ('https://pytest.org/en/stable/', None),
162162
'python': ('https://docs.python.org/3/', None),
163-
'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
163+
'scipy': ('https://docs.scipy.org/doc/scipy/', None),
164164
'tornado': ('https://www.tornadoweb.org/en/stable/', None),
165+
'xarray': ('https://xarray.pydata.org/en/stable/', None),
165166
}
166167

167168

@@ -189,8 +190,6 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
189190
'doc_module': ('matplotlib', 'mpl_toolkits'),
190191
'reference_url': {
191192
'matplotlib': None,
192-
'numpy': 'https://numpy.org/doc/stable/',
193-
'scipy': 'https://docs.scipy.org/doc/scipy/reference/',
194193
},
195194
'backreferences_dir': Path('api') / Path('_as_gen'),
196195
'subsection_order': gallery_order.sectionorder,

‎doc/devel/development_setup.rst

Copy file name to clipboardExpand all lines: doc/devel/development_setup.rst
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ true for ``*.py`` files. If you change the C-extension source (which might
6060
also happen if you change branches) you will have to re-run
6161
``python -m pip install -ve .``
6262

63+
Installing pre-commit hooks
64+
===========================
65+
You can optionally install `pre-commit <https://pre-commit.com/>`_ hooks.
66+
These will automatically check flake8 and other style issues when you run
67+
``git commit``. The hooks are defined in the top level
68+
``.pre-commit-config.yaml`` file. To install the hooks ::
69+
70+
pip install pre-commit
71+
pre-commit install
72+
6373
Installing additional dependencies for development
6474
==================================================
6575
See :ref:`development-dependencies`.

‎doc/devel/documenting_mpl.rst

Copy file name to clipboardExpand all lines: doc/devel/documenting_mpl.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ commands::
307307

308308
python -m sphinx.ext.intersphinx 'https://docs.python.org/3/objects.inv'
309309
python -m sphinx.ext.intersphinx 'https://numpy.org/doc/stable/objects.inv'
310-
python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/scipy/reference/objects.inv'
310+
python -m sphinx.ext.intersphinx 'https://docs.scipy.org/doc/scipy/objects.inv'
311311
python -m sphinx.ext.intersphinx 'https://pandas.pydata.org/pandas-docs/stable/objects.inv'
312312

313313
.. _rst-figures-and-includes:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.