DOC The gallery is now built with sphinx-gallery

NelleV · NelleV · commit d5583f89021b · 2017-04-06T16:36:45.000-07:00
:D
diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,6 @@ lib/matplotlib/mpl-data/matplotlibrc
 # Documentation generated files #
 #################################
 doc/examples
-doc/_templates/gallery.html
 doc/users/installing.rst
 doc/_static/matplotlibrc
 doc/pyplots/tex_demo.png
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
@@ -75,7 +75,8 @@ <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 a sampling, see the <a href="{{ pathto('users/screenshots') }}">screenshots</a>, <a href="{{ pathto('gallery') }}">thumbnail</a> gallery,  and
+  For a sampling, see the <a href="{{ pathto('users/screenshots')
+  }}">screenshots</a>, <a href="{{ pathto('auto_examples/index') }}">thumbnail</a> gallery,  and
     <a href="{{ pathto('examples/index') }}">examples</a> directory</p>
 
 <p>For simple plotting the <tt>pyplot</tt> module provides a
@@ -99,7 +100,7 @@ <h1>Documentation</h1>
   </script>
 
   <p>Trying to learn how to do a particular kind of plot?  Check out
-  the <a href="{{ pathto('gallery') }}">gallery</a>, <a href="{{ pathto('examples/index') }}">examples</a>,
+  the <a href="{{ pathto('auto_examples/index') }}">gallery</a>, <a href="{{ pathto('examples/index') }}">examples</a>,
   or the <a href="{{ pathto('api/pyplot_summary') }}">list of plotting
   commands</a>.</p>
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -39,7 +39,7 @@ <h3>{{ _('Navigation') }}</h3>
 
         <li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
         <li><a href="{{ pathto('examples/index') }}">examples</a>|&nbsp;</li>
-        <li><a href="{{ pathto('gallery') }}">gallery</a>|&nbsp;</li>
+        <li><a href="{{ pathto('auto_examples/index') }}">gallery</a>|&nbsp;</li>
         <li><a href="{{ pathto('api/pyplot_summary') }}">pyplot</a>|&nbsp;</li>
         <li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -32,7 +32,6 @@
               'sphinx.ext.inheritance_diagram',
               'sphinx_gallery.gen_gallery',
               'sphinxext.gen_rst',
-              'sphinxext.gen_gallery',
               'matplotlib.sphinxext.plot_directive',
               'sphinxext.github',
               'numpydoc']
@@ -251,7 +250,6 @@
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 html_additional_pages = {'index': 'index.html',
-                         'gallery':'gallery.html',
                          'citing': 'citing.html'}
 
 # If false, no module index is generated.
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -442,7 +442,7 @@ We have hundreds of examples in subdirectories of
 :file:`matplotlib/examples`, and these are automatically generated
 when the website is built to show up both in the `examples
 <../examples/index.html>`_ and `gallery
-<../gallery.html>`_ sections of the website.
+<../auto_examples/index.html>`_ sections of the website.
 
 Any sample data that the example uses should be kept small and
 distributed with Matplotlib in the
diff --git a/doc/sphinxext/gen_gallery.py b/doc/sphinxext/gen_gallery.py
