Get rid of the mpl_examples symlink.

anntzer · anntzer · commit 9597c9aee6ea · 2018-01-20T01:31:18.000-08:00
diff --git a/doc/README.txt b/doc/README.txt
@@ -36,6 +36,3 @@ python documentation system built on top of ReST.  This directory contains
 * _templates - used by the sphinx build system
 
 * sphinxext - Sphinx extensions for the mpl docs
-
-* mpl_examples - a link to the Matplotlib examples in case any
-  documentation wants to literal include them
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -276,27 +276,20 @@ tutorial in :doc:`/tutorials/introductory/customizing`::
 
     .. literalinclude:: ../../_static/matplotlibrc
 
-This is rendered as :doc:`/tutorials/introductory/customizing` (see the
-bottom of the page.  Note that this is in a tutorial;  See
-:ref:`writing-examples-and-tutorials` below)
+This is rendered as at the bottom of
+:doc:`/tutorials/introductory/customizing`.  Note that this is in a tutorial;
+see :ref:`writing-examples-and-tutorials` below.
 
-In the top level :file:`doc` directory there are symlinks pointing to the
-Matplotlib :file:`examples`:
-
-.. code-block:: sh
-
-    home:~/mpl/doc> ls -l mpl_*
-    mpl_examples -> ../examples
-
-Plots are included from the examples dir using the symlink:
+The examples directory is also copied to :file:`doc/gallery` by sphinx-gallery,
+so plots from the examples directory can be included using
 
 .. code-block:: rst
 
-    .. plot:: mpl_examples/pylab_examples/simple_plot.py
+    .. plot:: gallery/pylab_examples/simple_plot.py
 
-Note that the python script that generates the plot is referred to, rather
-than any plot that is created.  `Sphinx Gallery`_ will provide the incorrect
-reference when the documentation is built.
+Note that the python script that generates the plot is referred to, rather than
+any plot that is created; sphinx-gallery will provide the correct reference
+when the documentation is built.
 
 
 .. _writing-docstrings:
@@ -392,7 +385,6 @@ to keep in mind:
              ['aitoff' | 'hammer' | 'lambert' | 'mollweide' | \
      'polar' | 'rectilinear'], optional
              The projection type of the axes.
-        """
 
          ...
          """
diff --git a/doc/mpl_examples b/doc/mpl_examples
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1153,7 +1153,7 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         Examples
         --------
 
-        .. plot:: mpl_examples/lines_bars_and_markers/eventplot_demo.py
+        .. plot:: gallery/lines_bars_and_markers/eventplot_demo.py
         """
         self._process_unit_info(xdata=positions,
                                 ydata=[lineoffsets, linelengths],
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1392,7 +1392,7 @@ def __init__(self,
         Examples
         --------
 
-        .. plot:: mpl_examples/lines_bars_and_markers/eventcollection_demo.py
+        .. plot:: gallery/lines_bars_and_markers/eventcollection_demo.py
         """
 
         segment = (lineoffset + linelength / 2.,
diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-norecursedirs = .git build ci dist doc extern lib/mpl_examples release unit venv
+testpaths = lib
 python_files = test_*.py
 
 markers =
