updating cross-refs and adding sphinx-gallery version dependency

choldgraf · choldgraf · commit b5227fe3eef2 · 2017-08-04T11:19:23.000-07:00
diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -13,4 +13,4 @@ mock
 numpydoc
 pillow
 scipy
-sphinx-gallery
+sphinx-gallery>=0.1.12
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -55,7 +55,7 @@ <h1>Introduction</h1>
   interface toolkits.</p>
 
   <div class="responsive_screenshots">
-    <a a href="{{ pathto('tutorials/01_introductory/sample_plots') }}">
+    <a a href="{{ pathto('tutorials/introductory/sample_plots') }}">
       <div class="responsive_subfig">
         <img align="middle", src="{{ pathto('_images/sphx_glr_membrane_thumb.png', 1) }}", border="0", alt="screenshots"/>
       </div>
@@ -75,7 +75,7 @@ <h1>Introduction</h1>
   <p>Matplotlib tries to make easy things easy and hard things possible.
   You can generate plots, histograms, power spectra, bar charts,
   errorcharts, scatterplots, etc., with just a few lines of code.
-  For examples, see the <a href="{{ pathto('tutorials/01_introductory/sample_plots')
+  For examples, see the <a href="{{ pathto('tutorials/introductory/sample_plots')
   }}">sample plots</a> and <a href="{{ pathto('gallery/index') }}">thumbnail</a> gallery.</p>
 
 <p>For simple plotting the <tt>pyplot</tt> module provides a
diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst
@@ -8,7 +8,7 @@ The Pyplot API
 The :mod:`matplotlib.pyplot` module contains functions that allow you to generate
 many kinds of plots quickly. For examples that showcase the use
 of the :mod:`matplotlib.pyplot` module, see the
-:ref:`sphx_glr_tutorials_01_introductory_pyplot.py`
+:ref:`sphx_glr_tutorials_introductory_pyplot.py`
 or the :ref:`pyplots_examples`. We also recommend that you look into
 the object-oriented approach to plotting, described below.
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -105,7 +105,7 @@ def _check_deps():
                           '../tutorials/introductory',
                           '../tutorials/intermediate',
                           '../tutorials/advanced']
-for folder in glob('../examples/*') + glob('../tutorials/*'):
+for folder in sorted(glob('../examples/*') + glob('../tutorials/*')):
     if not os.path.isdir(folder) or folder in explicit_order_folders:
         continue
     explicit_order_folders.append(folder)
diff --git a/doc/users/intro.rst b/doc/users/intro.rst
@@ -62,10 +62,10 @@ The Matplotlib code is conceptually divided into three parts: the
 *pylab interface* is the set of functions provided by
 :mod:`matplotlib.pylab` which allow the user to create plots with code
 quite similar to MATLAB figure generating code
-(:ref:`sphx_glr_tutorials_01_introductory_pyplot.py`).  The *Matplotlib frontend* or *Matplotlib
+(:ref:`sphx_glr_tutorials_introductory_pyplot.py`).  The *Matplotlib frontend* or *Matplotlib
 API* is the set of classes that do the heavy lifting, creating and
 managing figures, text, lines, plots and so on
-(:ref:`sphx_glr_tutorials_02_intermediate_artists.py`).  This is an abstract interface that knows
+(:ref:`sphx_glr_tutorials_intermediate_artists.py`).  This is an abstract interface that knows
 nothing about output.  The *backends* are device-dependent drawing
 devices, aka renderers, that transform the frontend representation to
 hardcopy or a display device (:ref:`what-is-a-backend`).  Example
diff --git a/doc/users/prev_whats_new/whats_new_0.99.rst b/doc/users/prev_whats_new/whats_new_0.99.rst
@@ -11,11 +11,11 @@ New in matplotlib 0.99
 New documentation
 -----------------
 
-Jae-Joon Lee has written two new guides :ref:`sphx_glr_tutorials_02_intermediate_legend_guide.py`
+Jae-Joon Lee has written two new guides :ref:`sphx_glr_tutorials_intermediate_legend_guide.py`
 and :ref:`plotting-guide-annotation`.  Michael Sarahan has written
-:ref:`sphx_glr_tutorials_01_introductory_images.py`.  John Hunter has written two new tutorials on
-working with paths and transformations: :ref:`sphx_glr_tutorials_03_advanced_path_tutorial.py` and
-:ref:`sphx_glr_tutorials_03_advanced_transforms_tutorial.py`.
+:ref:`sphx_glr_tutorials_introductory_images.py`.  John Hunter has written two new tutorials on
+working with paths and transformations: :ref:`sphx_glr_tutorials_advanced_path_tutorial.py` and
+:ref:`sphx_glr_tutorials_advanced_transforms_tutorial.py`.
 
 .. _whats-new-mplot3d:
 
diff --git a/doc/users/prev_whats_new/whats_new_1.0.rst b/doc/users/prev_whats_new/whats_new_1.0.rst
@@ -23,7 +23,7 @@ Sophisticated subplot grid layout
 
 Jae-Joon Lee has written :mod:`~matplotlib.gridspec`, a new module for
 doing complex subplot layouts, featuring row and column spans and
-more.  See :ref:`sphx_glr_tutorials_02_intermediate_gridspec.py` for a tutorial overview.
+more.  See :ref:`sphx_glr_tutorials_intermediate_gridspec.py` for a tutorial overview.
 
 .. figure:: ../../gallery/userdemo/images/sphx_glr_demo_gridspec01_000.png
    :target: ../../gallery/userdemo/demo_gridspec01.html
diff --git a/doc/users/prev_whats_new/whats_new_1.1.rst b/doc/users/prev_whats_new/whats_new_1.1.rst
@@ -87,7 +87,7 @@ The usage of this functionality can be as simple as ::
 
 and it will adjust the spacing between subplots
 so that the axis labels do not overlap with neighboring subplots. A
-:ref:`sphx_glr_tutorials_02_intermediate_tight_layout_guide.py` has been created to show how to use
+:ref:`sphx_glr_tutorials_intermediate_tight_layout_guide.py` has been created to show how to use
 this new tool.
 
 PyQT4, PySide, and IPython
@@ -116,7 +116,7 @@ legends for complex plots such as :meth:`~matplotlib.pyplot.stem` plots
 will now display correctly. Second, the 'best' placement of a legend has
 been improved in the presence of NANs.
 
-See the :ref:`sphx_glr_tutorials_02_intermediate_legend_guide.py` for more detailed explanation and
+See the :ref:`sphx_glr_tutorials_intermediate_legend_guide.py` for more detailed explanation and
 examples.
 
 .. figure:: ../../gallery/text_labels_and_annotations/images/sphx_glr_legend_demo_004.png
@@ -228,7 +228,3 @@ Other improvements
   other colormaps :ref:`here <color-colormaps_reference>`.
 
 * Many bug fixes and documentation improvements.
-
-
-
-
diff --git a/doc/users/prev_whats_new/whats_new_1.4.rst b/doc/users/prev_whats_new/whats_new_1.4.rst
@@ -410,7 +410,7 @@ instead of ``:context:`` any time you want to reset the context.
 
 Legend and PathEffects documentation
 ------------------------------------
-The :ref:`sphx_glr_tutorials_02_intermediate_legend_guide.py` and :ref:`sphx_glr_tutorials_03_advanced_patheffects_guide.py` have both been
+The :ref:`sphx_glr_tutorials_intermediate_legend_guide.py` and :ref:`sphx_glr_tutorials_advanced_patheffects_guide.py` have both been
 updated to better reflect the full potential of each of these powerful
 features.
 
@@ -427,5 +427,3 @@ rectangle stay on the axes after you release the mouse.
 GAE integration
 ---------------
 Matplotlib will now run on google app engine.
-
-
diff --git a/doc/users/shell.rst b/doc/users/shell.rst
@@ -92,7 +92,7 @@ are going to need to understand what a matplotlib backend is
 With the TkAgg backend, which uses the Tkinter user interface toolkit,
 you can use matplotlib from an arbitrary non-gui python shell.  Just set your
 ``backend : TkAgg`` and ``interactive : True`` in your
-:file:`matplotlibrc` file (see :ref:`sphx_glr_tutorials_01_introductory_customizing.py`) and fire
+:file:`matplotlibrc` file (see :ref:`sphx_glr_tutorials_introductory_customizing.py`) and fire
 up python.  Then::
 
   >>> from pylab import *
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -8,7 +8,7 @@
     Most users would normally create a legend via the
     :meth:`~matplotlib.axes.Axes.legend` function. For more details on legends
     there is also a :ref:`legend guide
-    <sphx_glr_tutorials_02_intermediate_legend_guide.py>`.
+    <sphx_glr_tutorials_intermediate_legend_guide.py>`.
 
 The Legend class can be considered as a container of legend handles
 and legend texts. Creation of corresponding legend handles from the
@@ -19,7 +19,7 @@
 Note that not all kinds of artist are supported by the legend yet by default
 but it is possible to extend the legend handler's capabilities to support
 arbitrary objects. See the :ref:`legend guide
-<sphx_glr_tutorials_02_intermediate_legend_guide.py>` for more information.
+<sphx_glr_tutorials_intermediate_legend_guide.py>` for more information.
 
 """
 from __future__ import (absolute_import, division, print_function,
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -2,7 +2,7 @@
 This module defines default legend handlers.
 
 It is strongly encouraged to have read the :ref:`legend guide
-<sphx_glr_tutorials_02_intermediate_legend_guide.py>` before this documentation.
+<sphx_glr_tutorials_intermediate_legend_guide.py>` before this documentation.
 
 Legend handlers are expected to be a callable object with a following
 signature. ::
diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py
@@ -26,7 +26,7 @@
 The second is based on MATLAB and uses
 a state-based interface. This is encapsulated in the :mod:`pyplot`
 module. See the :ref:`pyplot tutorials
-<sphx_glr_tutorials_01_introductory_pyplot.py>`
+<sphx_glr_tutorials_introductory_pyplot.py>`
 for a more in-depth look at the pyplot interface.
 
 Most of the terms are straightforward but the main thing to remember
@@ -149,7 +149,7 @@
 # that we create. To do this we'll set the ``autolayout`` value of our
 # rcParams. For more information on controlling the style, layout, and
 # other features of plots with rcParams, see
-# :ref:`sphx_glr_tutorials_01_introductory_customizing.py`.
+# :ref:`sphx_glr_tutorials_introductory_customizing.py`.
 
 plt.rcParams.update({'figure.autolayout': True})
 
diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py
@@ -314,7 +314,7 @@ def my_plotter(ax, data1, data2, param_dict):
 #
 #
 # #. The ``backend`` parameter in your ``matplotlibrc`` file (see
-#    :ref:`sphx_glr_tutorials_01_introductory_customizing.py`)::
+#    :ref:`sphx_glr_tutorials_introductory_customizing.py`)::
 #
 #        backend : WXAgg   # use wxpython with antigrain (agg) rendering
 #
@@ -498,7 +498,7 @@ def my_plotter(ax, data1, data2, param_dict):
 # that are called, and on a state variable that determines whether
 # matplotlib is in "interactive mode".  The default Boolean value is set
 # by the :file:`matplotlibrc` file, and may be customized like any other
-# configuration parameter (see :ref:`sphx_glr_tutorials_01_introductory_customizing.py`).  It
+# configuration parameter (see :ref:`sphx_glr_tutorials_introductory_customizing.py`).  It
 # may also be set via :func:`matplotlib.interactive`, and its
 # value may be queried via :func:`matplotlib.is_interactive`.  Turning
 # interactive mode on and off in the middle of a stream of plotting
diff --git a/tutorials/text/mathtext.py b/tutorials/text/mathtext.py
@@ -23,7 +23,7 @@
 # (from (La)TeX), `STIX <http://www.stixfonts.org/>`_ fonts (with are designed
 # to blend well with Times), or a Unicode font that you provide.  The mathtext
 # font can be selected with the customization variable ``mathtext.fontset`` (see
-# :ref:`sphx_glr_tutorials_01_introductory_customizing.py`)
+# :ref:`sphx_glr_tutorials_introductory_customizing.py`)
 #
 # .. note::
 #    On `"narrow" <http://wordaligned.org/articles/narrow-python>`_ builds
diff --git a/tutorials/text/usetex.py b/tutorials/text/usetex.py
@@ -26,7 +26,7 @@
 external dependencies must all be located on your :envvar:`PATH`.
 
 There are a couple of options to mention, which can be changed using :ref:`rc
-settings <sphx_glr_tutorials_01_introductory_customizing.py>`. Here is an example matplotlibrc file::
+settings <sphx_glr_tutorials_introductory_customizing.py>`. Here is an example matplotlibrc file::
 
   font.family        : serif
   font.serif         : Times, Palatino, New Century Schoolbook, Bookman, Computer Modern Roman
