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 2703950

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

File tree

Expand file treeCollapse file tree

94 files changed

+1190
-1349
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

94 files changed

+1190
-1349
lines changed

‎INSTALL.rst

Copy file name to clipboardExpand all lines: INSTALL.rst
+4-4Lines 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

Copy file name to clipboardExpand all lines: doc/api/api_changes.rst
+2-2Lines 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

Copy file name to clipboardExpand all lines: doc/api/backend_qt4agg_api.rst
+6-4Lines 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

Copy file name to clipboardExpand all lines: doc/api/backend_qt4cairo_api.rst
+6-4Lines 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

Copy file name to clipboardExpand all lines: doc/api/backend_qt5agg_api.rst
+6-4Lines 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

Copy file name to clipboardExpand all lines: doc/api/backend_qt5cairo_api.rst
+6-4Lines 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

Copy file name to clipboardExpand all lines: doc/api/pyplot_summary.rst
+2-2Lines 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

Copy file name to clipboardExpand all lines: doc/devel/contributing.rst
+1-1Lines 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

Copy file name to clipboardExpand all lines: doc/faq/howto_faq.rst
+8-8Lines 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

Copy file name to clipboardExpand all lines: doc/faq/installing_faq.rst
+1-1Lines 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

‎doc/faq/troubleshooting_faq.rst

Copy file name to clipboardExpand all lines: doc/faq/troubleshooting_faq.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ provide the following information in your e-mail to the `mailing list
104104
`Enthought Canopy <https://www.enthought.com/products/canopy/>`_).
105105

106106
* Any customizations to your ``matplotlibrc`` file (see
107-
:ref:`sphx_glr_tutorials_introductory_customizing.py`).
107+
:doc:`/tutorials/introductory/customizing`).
108108

109109
* If the problem is reproducible, please try to provide a *minimal*, standalone
110110
Python script that demonstrates the problem. This is *the* critical step.

‎doc/mpl_toolkits/index.rst

Copy file name to clipboardExpand all lines: doc/mpl_toolkits/index.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ mplot3d
2121
plotting (scatter, surf, line, mesh) tools. Not the fastest or most feature
2222
complete 3D library out there, but it ships with Matplotlib and thus may be a
2323
lighter weight solution for some use cases. Check out the
24-
:ref:`mplot3d tutorial <sphx_glr_tutorials_toolkits_mplot3d.py>` for more
24+
:doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for more
2525
information.
2626

2727
.. figure:: ../gallery/mplot3d/images/sphx_glr_contourf3d_2_001.png

‎doc/mpl_toolkits/mplot3d/index.rst

Copy file name to clipboardExpand all lines: doc/mpl_toolkits/mplot3d/index.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The mplot3d toolkit adds simple 3D plotting capabilities to matplotlib by
1111
supplying an axes object that can create a 2D projection of a 3D scene.
1212
The resulting graph will have the same look and feel as regular 2D plots.
1313

14-
See the :ref:`mplot3d tutorial <sphx_glr_tutorials_toolkits_mplot3d.py>` for
14+
See the :doc:`mplot3d tutorial </tutorials/toolkits/mplot3d>` for
1515
more information on how to use this toolkit.
1616

1717
.. image:: ../../_static/demo_mplot3d.png

‎doc/sphinxext/mock_gui_toolkits.py

Copy file name to clipboardExpand all lines: doc/sphinxext/mock_gui_toolkits.py
-104Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -10,108 +10,6 @@ class MyCairoCffi(MagicMock):
1010
version_info = (1, 4, 0)
1111

1212

13-
class MyPyQt4(MagicMock):
14-
class QtGui(object):
15-
# PyQt4.QtGui public classes.
16-
# Generated with
17-
# textwrap.fill([name for name in dir(PyQt4.QtGui)
18-
# if isinstance(getattr(PyQt4.QtGui, name), type)])
19-
_QtGui_public_classes = """\
20-
Display QAbstractButton QAbstractGraphicsShapeItem
21-
QAbstractItemDelegate QAbstractItemView QAbstractPrintDialog
22-
QAbstractProxyModel QAbstractScrollArea QAbstractSlider
23-
QAbstractSpinBox QAbstractTextDocumentLayout QAction QActionEvent
24-
QActionGroup QApplication QBitmap QBoxLayout QBrush QButtonGroup
25-
QCalendarWidget QCheckBox QClipboard QCloseEvent QColor QColorDialog
26-
QColumnView QComboBox QCommandLinkButton QCommonStyle QCompleter
27-
QConicalGradient QContextMenuEvent QCursor QDataWidgetMapper QDateEdit
28-
QDateTimeEdit QDesktopServices QDesktopWidget QDial QDialog
29-
QDialogButtonBox QDirModel QDockWidget QDoubleSpinBox QDoubleValidator
30-
QDrag QDragEnterEvent QDragLeaveEvent QDragMoveEvent QDropEvent
31-
QErrorMessage QFileDialog QFileIconProvider QFileOpenEvent
32-
QFileSystemModel QFocusEvent QFocusFrame QFont QFontComboBox
33-
QFontDatabase QFontDialog QFontInfo QFontMetrics QFontMetricsF
34-
QFormLayout QFrame QGesture QGestureEvent QGestureRecognizer QGlyphRun
35-
QGradient QGraphicsAnchor QGraphicsAnchorLayout QGraphicsBlurEffect
36-
QGraphicsColorizeEffect QGraphicsDropShadowEffect QGraphicsEffect
37-
QGraphicsEllipseItem QGraphicsGridLayout QGraphicsItem
38-
QGraphicsItemAnimation QGraphicsItemGroup QGraphicsLayout
39-
QGraphicsLayoutItem QGraphicsLineItem QGraphicsLinearLayout
40-
QGraphicsObject QGraphicsOpacityEffect QGraphicsPathItem
41-
QGraphicsPixmapItem QGraphicsPolygonItem QGraphicsProxyWidget
42-
QGraphicsRectItem QGraphicsRotation QGraphicsScale QGraphicsScene
43-
QGraphicsSceneContextMenuEvent QGraphicsSceneDragDropEvent
44-
QGraphicsSceneEvent QGraphicsSceneHelpEvent QGraphicsSceneHoverEvent
45-
QGraphicsSceneMouseEvent QGraphicsSceneMoveEvent
46-
QGraphicsSceneResizeEvent QGraphicsSceneWheelEvent
47-
QGraphicsSimpleTextItem QGraphicsTextItem QGraphicsTransform
48-
QGraphicsView QGraphicsWidget QGridLayout QGroupBox QHBoxLayout
49-
QHeaderView QHelpEvent QHideEvent QHoverEvent QIcon QIconDragEvent
50-
QIconEngine QIconEngineV2 QIdentityProxyModel QImage QImageIOHandler
51-
QImageReader QImageWriter QInputContext QInputContextFactory
52-
QInputDialog QInputEvent QInputMethodEvent QIntValidator QItemDelegate
53-
QItemEditorCreatorBase QItemEditorFactory QItemSelection
54-
QItemSelectionModel QItemSelectionRange QKeyEvent QKeyEventTransition
55-
QKeySequence QLCDNumber QLabel QLayout QLayoutItem QLineEdit
56-
QLinearGradient QListView QListWidget QListWidgetItem QMainWindow
57-
QMatrix QMatrix2x2 QMatrix2x3 QMatrix2x4 QMatrix3x2 QMatrix3x3
58-
QMatrix3x4 QMatrix4x2 QMatrix4x3 QMatrix4x4 QMdiArea QMdiSubWindow
59-
QMenu QMenuBar QMessageBox QMimeSource QMouseEvent
60-
QMouseEventTransition QMoveEvent QMovie QPageSetupDialog QPaintDevice
61-
QPaintEngine QPaintEngineState QPaintEvent QPainter QPainterPath
62-
QPainterPathStroker QPalette QPanGesture QPen QPicture QPictureIO
63-
QPinchGesture QPixmap QPixmapCache QPlainTextDocumentLayout
64-
QPlainTextEdit QPolygon QPolygonF QPrintDialog QPrintEngine
65-
QPrintPreviewDialog QPrintPreviewWidget QPrinter QPrinterInfo
66-
QProgressBar QProgressDialog QProxyModel QPushButton QPyTextObject
67-
QQuaternion QRadialGradient QRadioButton QRawFont QRegExpValidator
68-
QRegion QResizeEvent QRubberBand QScrollArea QScrollBar
69-
QSessionManager QShortcut QShortcutEvent QShowEvent QSizeGrip
70-
QSizePolicy QSlider QSortFilterProxyModel QSound QSpacerItem QSpinBox
71-
QSplashScreen QSplitter QSplitterHandle QStackedLayout QStackedWidget
72-
QStandardItem QStandardItemModel QStaticText QStatusBar
73-
QStatusTipEvent QStringListModel QStyle QStyleFactory QStyleHintReturn
74-
QStyleHintReturnMask QStyleHintReturnVariant QStyleOption
75-
QStyleOptionButton QStyleOptionComboBox QStyleOptionComplex
76-
QStyleOptionDockWidget QStyleOptionDockWidgetV2 QStyleOptionFocusRect
77-
QStyleOptionFrame QStyleOptionFrameV2 QStyleOptionFrameV3
78-
QStyleOptionGraphicsItem QStyleOptionGroupBox QStyleOptionHeader
79-
QStyleOptionMenuItem QStyleOptionProgressBar QStyleOptionProgressBarV2
80-
QStyleOptionRubberBand QStyleOptionSizeGrip QStyleOptionSlider
81-
QStyleOptionSpinBox QStyleOptionTab QStyleOptionTabBarBase
82-
QStyleOptionTabBarBaseV2 QStyleOptionTabV2 QStyleOptionTabV3
83-
QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2
84-
QStyleOptionTitleBar QStyleOptionToolBar QStyleOptionToolBox
85-
QStyleOptionToolBoxV2 QStyleOptionToolButton QStyleOptionViewItem
86-
QStyleOptionViewItemV2 QStyleOptionViewItemV3 QStyleOptionViewItemV4
87-
QStylePainter QStyledItemDelegate QSwipeGesture QSyntaxHighlighter
88-
QSystemTrayIcon QTabBar QTabWidget QTableView QTableWidget
89-
QTableWidgetItem QTableWidgetSelectionRange QTabletEvent
90-
QTapAndHoldGesture QTapGesture QTextBlock QTextBlockFormat
91-
QTextBlockGroup QTextBlockUserData QTextBrowser QTextCharFormat
92-
QTextCursor QTextDocument QTextDocumentFragment QTextDocumentWriter
93-
QTextEdit QTextFormat QTextFragment QTextFrame QTextFrameFormat
94-
QTextImageFormat QTextInlineObject QTextItem QTextLayout QTextLength
95-
QTextLine QTextList QTextListFormat QTextObject QTextObjectInterface
96-
QTextOption QTextTable QTextTableCell QTextTableCellFormat
97-
QTextTableFormat QTimeEdit QToolBar QToolBox QToolButton QToolTip
98-
QTouchEvent QTransform QTreeView QTreeWidget QTreeWidgetItem
99-
QTreeWidgetItemIterator QUndoCommand QUndoGroup QUndoStack QUndoView
100-
QVBoxLayout QValidator QVector2D QVector3D QVector4D QWhatsThis
101-
QWhatsThisClickedEvent QWheelEvent QWidget QWidgetAction QWidgetItem
102-
QWindowStateChangeEvent QWizard QWizardPage QWorkspace
103-
QX11EmbedContainer QX11EmbedWidget QX11Info
104-
"""
105-
for _name in _QtGui_public_classes.split():
106-
locals()[_name] = type(_name, (), {})
107-
del _name
108-
109-
110-
class MySip(MagicMock):
111-
def getapi(*args):
112-
return 1
113-
114-
11513
class MyWX(MagicMock):
11614
class Panel(object):
11715
pass
@@ -127,8 +25,6 @@ class Frame(object):
12725

12826
def setup(app):
12927
sys.modules['cairocffi'] = MyCairoCffi()
130-
sys.modules['PyQt4'] = MyPyQt4()
131-
sys.modules['sip'] = MySip()
13228
sys.modules['wx'] = MyWX()
13329
sys.modules['wxversion'] = MagicMock()
13430

‎doc/users/dflt_style_changes.rst

Copy file name to clipboardExpand all lines: doc/users/dflt_style_changes.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ are only specified via hex values. To access these colors outside of
9696
the property cycling the notation for colors ``'CN'``, where ``N``
9797
takes values 0-9, was added to
9898
denote the first 10 colors in ``mpl.rcParams['axes.prop_cycle']`` See
99-
:ref:`sphx_glr_tutorials_colors_colors.py` for more details.
99+
:doc:`/tutorials/colors/colors` for more details.
100100

101101
To restore the old color cycle use
102102

@@ -145,7 +145,7 @@ watch Nathaniel Smith and Stéfan van der Walt's talk from SciPy2015.
145145
See `here for many more details <https://bids.github.io/colormap/>`__
146146
about the other alternatives and the tools used to create the color
147147
map. For details on all of the color maps available in matplotlib see
148-
:ref:`sphx_glr_tutorials_colors_colormaps.py`.
148+
:doc:`/tutorials/colors/colormaps`.
149149

150150
.. raw:: html
151151

‎doc/users/prev_whats_new/whats_new_0.98.4.rst

Copy file name to clipboardExpand all lines: doc/users/prev_whats_new/whats_new_0.98.4.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ psd amplitude scaling
7979

8080
Ryan May did a lot of work to rationalize the amplitude scaling of
8181
:func:`~matplotlib.pyplot.psd` and friends. See
82-
:ref:`sphx_glr_gallery_lines_bars_and_markers_psd_demo.py`.
82+
:doc:`/gallery/lines_bars_and_markers/psd_demo`.
8383
The changes should increase MATLAB
8484
compatibility and increase scaling options.
8585

‎doc/users/prev_whats_new/whats_new_0.99.rst

Copy file name to clipboardExpand all lines: doc/users/prev_whats_new/whats_new_0.99.rst
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ New in matplotlib 0.99
1111
New documentation
1212
-----------------
1313

14-
Jae-Joon Lee has written two new guides :ref:`sphx_glr_tutorials_intermediate_legend_guide.py`
14+
Jae-Joon Lee has written two new guides :doc:`/tutorials/intermediate/legend_guide`
1515
and :ref:`plotting-guide-annotation`. Michael Sarahan has written
16-
:ref:`sphx_glr_tutorials_introductory_images.py`. John Hunter has written two new tutorials on
17-
working with paths and transformations: :ref:`sphx_glr_tutorials_advanced_path_tutorial.py` and
18-
:ref:`sphx_glr_tutorials_advanced_transforms_tutorial.py`.
16+
:doc:`/tutorials/introductory/images`. John Hunter has written two new tutorials on
17+
working with paths and transformations: :doc:`/tutorials/advanced/path_tutorial` and
18+
:doc:`/tutorials/advanced/transforms_tutorial`.
1919

2020
.. _whats-new-mplot3d:
2121

@@ -65,7 +65,7 @@ that denote the data limits -- in various arbitrary locations. No
6565
longer are your axis lines constrained to be a simple rectangle around
6666
the figure -- you can turn on or off left, bottom, right and top, as
6767
well as "detach" the spine to offset it away from the data. See
68-
:ref:`sphx_glr_gallery_ticks_and_spines_spine_placement_demo.py` and
68+
:doc:`/gallery/ticks_and_spines/spine_placement_demo` and
6969
:class:`matplotlib.spines.Spine`.
7070

7171
.. figure:: ../../gallery/pyplots/images/sphx_glr_whats_new_99_spines_001.png

0 commit comments

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