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

Skip to content

Commit 711abc9

Browse files
DennisTismenkoDennisTismenko
committed
Merge branch 'master' of github.com:matplotlib/matplotlib into Fix-13799
2 parents 3316180 + 50242cf commit 711abc9

File tree

104 files changed

+1164
-2701
lines changed

Some content is hidden

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

104 files changed

+1164
-2701
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Circle CI configuration file
22
# https://circleci.com/docs/
33

4-
version: 2
4+
version: 2.1
55

66

77
###########################################
@@ -115,10 +115,6 @@ jobs:
115115
- store_artifacts:
116116
path: doc/build/html
117117

118-
- run:
119-
name: "Built documentation is available at:"
120-
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
121-
122118
docs-python37:
123119
docker:
124120
- image: circleci/python:3.7
@@ -141,10 +137,6 @@ jobs:
141137
- store_artifacts:
142138
path: doc/build/html
143139

144-
- run:
145-
name: "Built documentation is available at:"
146-
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
147-
148140
docs-python38:
149141
docker:
150142
- image: circleci/python:3.8
@@ -167,10 +159,6 @@ jobs:
167159
- store_artifacts:
168160
path: doc/build/html
169161

170-
- run:
171-
name: "Built documentation is available at:"
172-
command: echo "${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/doc/build/html/index.html"
173-
174162
- add_ssh_keys:
175163
fingerprints:
176164
- "78:13:59:08:61:a9:e5:09:af:df:3a:d8:89:c2:84:c0"

‎.github/workflows/circleci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
on: [status]
2+
jobs:
3+
circleci_artifacts_redirector_job:
4+
runs-on: ubuntu-latest
5+
name: Run CircleCI artifacts redirector
6+
steps:
7+
- name: GitHub Action step
8+
uses: larsoner/circleci-artifacts-redirector-action@master
9+
with:
10+
repo-token: ${{ secrets.GITHUB_TOKEN }}
11+
artifact-path: 0/doc/build/html/index.html
12+
circleci-jobs: docs-python36,docs-python37,docs-python38

‎README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
.. _Downloads: https://pepy.tech/project/matplotlib/month
3939

4040
.. |NUMFocus| image:: https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A
41-
.. _NUMFocus: http://www.numfocus.org
41+
.. _NUMFocus: https://www.numfocus.org
4242

43-
.. image:: doc/_static/logo2.png
43+
.. image:: https://matplotlib.org/_static/logo2.svg
4444

4545
Matplotlib is a comprehensive library for creating static, animated, and interactive visualizations in Python.
4646

47-
Check out our `home page <http://matplotlib.org/>`_ for more information.
47+
Check out our `home page <https://matplotlib.org/>`_ for more information.
4848

49-
.. image:: doc/_static/readme_preview.png
49+
.. image:: https://matplotlib.org/_static/readme_preview.png
5050

5151
Matplotlib produces publication-quality figures in a variety of hardcopy formats
5252
and interactive environments across platforms. Matplotlib can be used in Python scripts,
@@ -58,7 +58,7 @@ Install
5858
=======
5959

6060
For installation instructions and requirements, see `INSTALL.rst <INSTALL.rst>`_ or the
61-
`install <http://matplotlib.org/users/installing.html>`_ documentation.
61+
`install <https://matplotlib.org/users/installing.html>`_ documentation.
6262

6363
Test
6464
====
@@ -77,7 +77,7 @@ You've worked out a way to fix it – even better!
7777

7878
You want to tell us about it – best of all!
7979

80-
Start at the `contributing guide <http://matplotlib.org/devdocs/devel/contributing.html>`_!
80+
Start at the `contributing guide <https://matplotlib.org/devdocs/devel/contributing.html>`_!
8181

8282
Contact
8383
=======

‎doc/api/index.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,13 @@ Toolkits
132132
Matplotlib. The following toolkits are included:
133133

134134
.. toctree::
135-
:maxdepth: 1
135+
:hidden:
136136

137137
toolkits/index.rst
138+
139+
.. toctree::
140+
:maxdepth: 1
141+
138142
toolkits/mplot3d.rst
139143
toolkits/axes_grid1.rst
140144
toolkits/axisartist.rst

‎doc/api/next_api_changes/behaviour.rst

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,20 @@ deprecation warning.
100100

101101
Previously setting the *ecolor* would turn off automatic color cycling for the plot, leading to the
102102
the lines and markers defaulting to whatever the first color in the color cycle was in the case of
103-
multiple plot calls.
103+
multiple plot calls.
104+
105+
`.rcsetup.validate_color_for_prop_cycle` now always raises TypeError for bytes input
106+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
107+
It previously raised `TypeError`, **except** when the input was of the form
108+
``b"C[number]"`` in which case it raised a ValueError.
109+
110+
`.FigureCanvasPS.print_ps` and `.FigureCanvasPS.print_eps` no longer apply edgecolor and facecolor
111+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
112+
113+
These methods now assume that the figure edge and facecolor have been correctly
114+
applied by `.FigureCanvasBase.print_figure`, as they are normally called
115+
through it.
116+
117+
This behavior is consistent with other figure saving methods
118+
(`.FigureCanvasAgg.print_png`, `.FigureCanvasPdf.print_pdf`,
119+
`.FigureCanvasSVG.print_svg`).

‎doc/api/next_api_changes/deprecations.rst

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,13 @@ Setting a `.Line2D`\'s pickradius (i.e. the tolerance for pick events
142142
and containment checks) via `.Line2D.set_picker` is deprecated. Use
143143
`.Line2D.set_pickradius` instead.
144144

145-
`.Line2D.set_picker` no longer sets the artist's custom-contain() check. Use
146-
``Line2D.set_contains`` instead.
145+
`.Line2D.set_picker` no longer sets the artist's custom-contain() check.
146+
147+
``Artist.set_contains``, ``Artist.get_contains``
148+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
149+
Setting a custom method overridding `.Artist.contains` is deprecated.
150+
There is no replacement, but you may still customize pick events using
151+
`.Artist.set_picker`.
147152

148153
`~matplotlib.colorbar.Colorbar` methods
149154
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -220,9 +225,22 @@ The following validators, defined in `.rcsetup`, are deprecated:
220225
``validate_movie_frame_fmt``, ``validate_axis_locator``,
221226
``validate_movie_html_fmt``, ``validate_grid_axis``,
222227
``validate_axes_titlelocation``, ``validate_toolbar``,
228+
<<<<<<< HEAD
229+
``validate_ps_papersize``, ``validate_legend_loc``,
230+
``validate_bool_maybe_none``, ``validate_hinting``,
231+
``validate_movie_writers``.
232+
To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
233+
RcParams(); rc[k] = v`` raises an exception.
234+
||||||| constructed merge base
223235
``validate_ps_papersize``, ``validate_legend_log``. To test whether an rcParam
224236
value would be acceptable, one can test e.g. ``rc = RcParams(); rc[k] = v``
225237
raises an exception.
238+
=======
239+
``validate_ps_papersize``, ``validate_legend_loc``,
240+
``validate_webagg_address``.
241+
To test whether an rcParam value would be acceptable, one can test e.g. ``rc =
242+
RcParams(); rc[k] = v`` raises an exception.
243+
>>>>>>> Deprecate validate_webagg_address.
226244

227245
Stricter rcParam validation
228246
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -242,3 +260,42 @@ The following related APIs are also deprecated:
242260
``matplotlib.test(recursionlimit=...)``
243261
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
244262
The *recursionlimit* parameter of ``matplotlib.test`` is deprecated.
263+
264+
mathtext glues
265+
~~~~~~~~~~~~~~
266+
The *copy* parameter of ``mathtext.Glue`` is deprecated (the underlying glue
267+
spec is now immutable). ``mathtext.GlueSpec`` is deprecated.
268+
269+
Signatures of `.Artist.draw` and `.Axes.draw`
270+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
271+
The *inframe* parameter to `.Axes.draw` is deprecated. Use
272+
`.Axes.redraw_in_frame` instead.
273+
274+
Not passing the *renderer* parameter to `.Axes.draw` is deprecated. Use
275+
``axes.draw_artist(axes)`` instead.
276+
277+
These changes make the signature of the ``draw`` (``artist.draw(renderer)``)
278+
method consistent across all artists; thus, additional parameters to
279+
`.Artist.draw` are deprecated.
280+
281+
``DraggableBase.on_motion_blit``
282+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
283+
This method is deprecated. `.DraggableBase.on_motion` now handles both the
284+
blitting and the non-blitting cases.
285+
286+
Passing the dash offset as None
287+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
288+
Fine control of dash patterns can be achieved by passing an ``(offset,
289+
(on-length, off-length, on-length, off-length, ...))`` pair as the linestyle
290+
property of `.Line2D` and `.LineCollection`. Previously, certain APIs would
291+
accept ``offset = None`` as a synonym for ``offset = 0``, but this was never
292+
universally implemented, e.g. for vector output. Support for ``offset = None``
293+
is deprecated, set the offset to 0 instead.
294+
295+
``RendererCairo.fontweights``, ``RendererCairo.fontangles``
296+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
297+
... are deprecated.
298+
299+
``autofmt_xdate(which=None)``
300+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
301+
This is deprecated, use its more explicit synonym, ``which="major"``, instead.

‎doc/api/toolkits/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ information.
2626
:align: center
2727
:scale: 50
2828

29-
Contourf3d 2
30-
3129
.. toctree::
3230
:maxdepth: 2
3331

‎doc/api/toolkits/mplot3d.rst

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mplot3d API
55
***********
66

77
.. contents::
8-
:backlinks: none
8+
:backlinks: none
99

1010
.. automodule:: mpl_toolkits.mplot3d
1111
:no-members:
@@ -70,15 +70,6 @@ mplot3d API
7070
art3d.PathPatch3D
7171
art3d.Poly3DCollection
7272
art3d.Text3D
73-
74-
75-
Art3D Utility Functions
76-
=======================
77-
78-
.. autosummary::
79-
:toctree: ../_as_gen
80-
:template: autosummary.rst
81-
8273
art3d.get_dir_vector
8374
art3d.juggle_axes
8475
art3d.line_2d_to_3d

‎doc/sphinxext/github.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ def make_link_node(rawtext, app, type, slug, options):
3939
base += '/'
4040
except AttributeError as err:
4141
raise ValueError(
42-
f'github_project_url configuration value is not set ({err})')
42+
f'github_project_url configuration value is not set '
43+
f'({err})') from err
4344

4445
ref = base + type + '/' + slug + '/'
4546
set_classes(options)
@@ -137,7 +138,8 @@ def ghcommit_role(
137138
base += '/'
138139
except AttributeError as err:
139140
raise ValueError(
140-
f'github_project_url configuration value is not set ({err})')
141+
f'github_project_url configuration value is not set '
142+
f'({err})') from err
141143

142144
ref = base + text
143145
node = nodes.reference(rawtext, text[:6], refuri=ref, **options)

‎doc/sphinxext/missing_references.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ def _truncate_location(location):
139139
This allows for easy comparison even when line numbers chagne
140140
(as they do regularily).
141141
"""
142-
if ":" in location:
143-
return location.split(":", 1)[0]
144-
return location
142+
return location.split(":", 1)[0]
145143

146144

147145
def _warn_unused_missing_references(app):

‎examples/images_contours_and_fields/tricontour_smooth_delaunay.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ def experiment_res(x, y):
124124

125125
# 1) plot of the refined (computed) data contours:
126126
ax.tricontour(tri_refi, z_test_refi, levels=levels, cmap=cmap,
127-
linewidths=[2.0, 0.5, 1.0, 0.5])
127+
linewidths=[2.0, 0.5, 1.0, 0.5])
128128
# 2) plot of the expected (analytical) data contours (dashed):
129129
if plot_expected:
130130
ax.tricontour(tri_refi, z_expected, levels=levels, cmap=cmap,
131-
linestyles='--')
131+
linestyles='--')
132132
# 3) plot of the fine mesh on which interpolation was done:
133133
if plot_refi_tri:
134134
ax.triplot(tri_refi, color='0.97')

‎examples/images_contours_and_fields/tricontour_smooth_user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ def function_z(x, y):
6969
cmap = cm.get_cmap(name='terrain', lut=None)
7070
ax.tricontourf(tri_refi, z_test_refi, levels=levels, cmap=cmap)
7171
ax.tricontour(tri_refi, z_test_refi, levels=levels,
72-
colors=['0.25', '0.5', '0.5', '0.5', '0.5'],
73-
linewidths=[1.0, 0.5, 0.5, 0.5, 0.5])
72+
colors=['0.25', '0.5', '0.5', '0.5', '0.5'],
73+
linewidths=[1.0, 0.5, 0.5, 0.5, 0.5])
7474

7575
ax.set_title("High-resolution tricontouring")
7676

0 commit comments

Comments
 (0)