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

Skip to content

Commit 2703950

Browse files
tacaswelltacaswell
authored
Merge pull request #11812 from tacaswell/final_backports
backports to prep for 2.2.3
2 parents f822dba + 42bd99a commit 2703950

94 files changed

Lines changed: 1190 additions & 1349 deletions

File tree

Some content is hidden

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

‎INSTALL.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ Optionally, you can also install a number of packages to enable better user
188188
interface toolkits. See :ref:`what-is-a-backend` for more details on the
189189
optional Matplotlib backends and the capabilities they provide.
190190

191-
* :term:`tk` (>= 8.3, != 8.6.0 or 8.6.1): for the TkAgg backend;
192-
* `PyQt4 <https://pypi.python.org/pypi/PyQt4>`_ (>= 4.4) or
193-
`PySide <https://pypi.python.org/pypi/PySide>`_: for the Qt4Agg backend;
194-
* `PyQt5 <https://pypi.python.org/pypi/PyQt5>`_: for the Qt5Agg backend;
191+
* :term:`tk` (>= 8.3, != 8.6.0 or 8.6.1): for the Tk-based backends;
192+
* `PyQt4 <https://pypi.python.org/pypi/PyQt4>`_ (>= 4.6) or
193+
`PySide <https://pypi.python.org/pypi/PySide>`_: for the Qt4-based backend;
194+
* `PyQt5 <https://pypi.python.org/pypi/PyQt5>`_: for the Qt5-based backend;
195195
* :term:`pygtk` (>= 2.4): for the GTK and the GTKAgg backend;
196196
* :term:`wxpython` (>= 2.9 or later): for the WX or WXAgg backend;
197197
* `cairocffi <https://cairocffi.readthedocs.io/en/latest/>`__ (>=

‎doc/api/api_changes.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ New dependency
3030

3131
`kiwisolver <https://github.com/nucleic/kiwi>`__ is now a required
3232
dependency to support the new constrained_layout, see
33-
:ref:`sphx_glr_tutorials_intermediate_constrainedlayout_guide.py` for
33+
:doc:`/tutorials/intermediate/constrainedlayout_guide` for
3434
more details.
3535

3636

@@ -1603,7 +1603,7 @@ original location:
16031603
* The legend handler interface has changed from a callable, to any object
16041604
which implements the ``legend_artists`` method (a deprecation phase will
16051605
see this interface be maintained for v1.4). See
1606-
:ref:`sphx_glr_tutorials_intermediate_legend_guide.py` for further details. Further legend changes
1606+
:doc:`/tutorials/intermediate/legend_guide` for further details. Further legend changes
16071607
include:
16081608

16091609
* :func:`matplotlib.axes.Axes._get_legend_handles` now returns a generator

‎doc/api/backend_qt4agg_api.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
:mod:`matplotlib.backends.backend_qt4agg`
33
=========================================
44

5-
.. automodule:: matplotlib.backends.backend_qt4agg
6-
:members:
7-
:undoc-members:
8-
:show-inheritance:
5+
**NOTE** Not included, to avoid adding a dependency to building the docs.
6+
7+
.. .. automodule:: matplotlib.backends.backend_qt4agg
8+
.. :members:
9+
.. :undoc-members:
10+
.. :show-inheritance:

‎doc/api/backend_qt4cairo_api.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
:mod:`matplotlib.backends.backend_qt4cairo`
33
===========================================
44

5-
.. automodule:: matplotlib.backends.backend_qt4cairo
6-
:members:
7-
:undoc-members:
8-
:show-inheritance:
5+
**NOTE** Not included, to avoid adding a dependency to building the docs.
6+
7+
.. .. automodule:: matplotlib.backends.backend_qt4cairo
8+
.. :members:
9+
.. :undoc-members:
10+
.. :show-inheritance:

‎doc/api/backend_qt5agg_api.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
:mod:`matplotlib.backends.backend_qt5agg`
33
=========================================
44

5-
.. automodule:: matplotlib.backends.backend_qt5agg
6-
:members:
7-
:undoc-members:
8-
:show-inheritance:
5+
**NOTE** Not included, to avoid adding a dependency to building the docs.
6+
7+
.. .. automodule:: matplotlib.backends.backend_qt5agg
8+
.. :members:
9+
.. :undoc-members:
10+
.. :show-inheritance:

‎doc/api/backend_qt5cairo_api.rst‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
:mod:`matplotlib.backends.backend_qt5cairo`
33
===========================================
44

5-
.. automodule:: matplotlib.backends.backend_qt5cairo
6-
:members:
7-
:undoc-members:
8-
:show-inheritance:
5+
**NOTE** Not included, to avoid adding a dependency to building the docs.
6+
7+
.. .. automodule:: matplotlib.backends.backend_qt5cairo
8+
.. :members:
9+
.. :undoc-members:
10+
.. :show-inheritance:

‎doc/api/pyplot_summary.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The Pyplot API
88
The :mod:`matplotlib.pyplot` module contains functions that allow you to generate
99
many kinds of plots quickly. For examples that showcase the use
1010
of the :mod:`matplotlib.pyplot` module, see the
11-
:ref:`sphx_glr_tutorials_introductory_pyplot.py`
11+
:doc:`/tutorials/introductory/pyplot`
1212
or the :ref:`pyplots_examples`. We also recommend that you look into
1313
the object-oriented approach to plotting, described below.
1414

@@ -38,6 +38,6 @@ There are many colormaps you can use to map data onto color values.
3838
Below we list several ways in which color can be utilized in Matplotlib.
3939

4040
For a more in-depth look at colormaps, see the
41-
:ref:`sphx_glr_tutorials_colors_colormaps.py` tutorial.
41+
:doc:`/tutorials/colors/colormaps` tutorial.
4242

4343
.. autofunction:: colormaps

‎doc/devel/contributing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ Developing a new backend
501501
------------------------
502502

503503
If you are working on a custom backend, the *backend* setting in
504-
:file:`matplotlibrc` (:ref:`sphx_glr_tutorials_introductory_customizing.py`) supports an
504+
:file:`matplotlibrc` (:doc:`/tutorials/introductory/customizing`) supports an
505505
external backend via the ``module`` directive. If
506506
:file:`my_backend.py` is a Matplotlib backend in your
507507
:envvar:`PYTHONPATH`, you can set it on one of several ways

‎doc/faq/howto_faq.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If you only want to use the `pandas` converter for `datetime64` values ::
4343
Find all objects in a figure of a certain type
4444
----------------------------------------------
4545

46-
Every Matplotlib artist (see :ref:`sphx_glr_tutorials_intermediate_artists.py`) has a method
46+
Every Matplotlib artist (see :doc:`/tutorials/intermediate/artists`) has a method
4747
called :meth:`~matplotlib.artist.Artist.findobj` that can be used to
4848
recursively search the artist for any artists it may contain that meet
4949
some criteria (e.g., match all :class:`~matplotlib.lines.Line2D`
@@ -155,7 +155,7 @@ labels::
155155
ax = fig.add_subplot(111)
156156

157157
You can control the defaults for these parameters in your
158-
:file:`matplotlibrc` file; see :ref:`sphx_glr_tutorials_introductory_customizing.py`. For
158+
:file:`matplotlibrc` file; see :doc:`/tutorials/introductory/customizing`. For
159159
example, to make the above setting permanent, you would set::
160160

161161
figure.subplot.bottom : 0.2 # the bottom of the subplots of the figure
@@ -186,7 +186,7 @@ specify the location explicitly::
186186
ax = fig.add_axes([left, bottom, width, height])
187187

188188
where all values are in fractional (0 to 1) coordinates. See
189-
:ref:`sphx_glr_gallery_subplots_axes_and_figures_axes_demo.py` for an example of placing axes manually.
189+
:doc:`/gallery/subplots_axes_and_figures/axes_demo` for an example of placing axes manually.
190190

191191
.. _howto-auto-adjust:
192192

@@ -196,7 +196,7 @@ Automatically make room for tick labels
196196
.. note::
197197
This is now easier to handle than ever before.
198198
Calling :func:`~matplotlib.pyplot.tight_layout` can fix many common
199-
layout issues. See the :ref:`sphx_glr_tutorials_intermediate_tight_layout_guide.py`.
199+
layout issues. See the :doc:`/tutorials/intermediate/tight_layout_guide`.
200200

201201
The information below is kept here in case it is useful for other
202202
purposes.
@@ -348,7 +348,7 @@ and patches, respectively::
348348

349349
.. htmlonly::
350350

351-
See :ref:`sphx_glr_gallery_misc_zorder_demo.py` for a complete example.
351+
See :doc:`/gallery/misc/zorder_demo` for a complete example.
352352

353353
You can also use the Axes property
354354
:meth:`~matplotlib.axes.Axes.set_axisbelow` to control whether the grid
@@ -367,7 +367,7 @@ some ratio which controls the ratio::
367367

368368
.. htmlonly::
369369

370-
See :ref:`sphx_glr_gallery_subplots_axes_and_figures_axis_equal_demo.py` for a
370+
See :doc:`/gallery/subplots_axes_and_figures/axis_equal_demo` for a
371371
complete example.
372372

373373
.. _howto-twoscale:
@@ -411,7 +411,7 @@ locators as desired because the two axes are independent.
411411

412412
.. htmlonly::
413413

414-
See :ref:`sphx_glr_gallery_api_two_scales.py` for a complete example
414+
See :doc:`/gallery/api/two_scales` for a complete example
415415

416416
.. _howto-batch:
417417

@@ -657,7 +657,7 @@ For more on configuring your backend, see
657657

658658
Alternatively, you can avoid pylab/pyplot altogether, which will give
659659
you a little more control, by calling the API directly as shown in
660-
:ref:`sphx_glr_gallery_api_agg_oo_sgskip.py`.
660+
:doc:`/gallery/api/agg_oo_sgskip`.
661661

662662
You can either generate hardcopy on the filesystem by calling savefig::
663663

‎doc/faq/installing_faq.rst‎

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

2727
This will give you additional information about which backends matplotlib is
2828
loading, version information, and more. At this point you might want to make
29-
sure you understand matplotlib's :ref:`configuration <sphx_glr_tutorials_introductory_customizing.py>`
29+
sure you understand matplotlib's :doc:`configuration </tutorials/introductory/customizing>`
3030
process, governed by the :file:`matplotlibrc` configuration file which contains
3131
instructions within and the concept of the matplotlib backend.
3232

0 commit comments

Comments
 (0)