Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b918016
DOC starting the migration to sphinx
NelleV Mar 8, 2017
b110b1f
DOC Set up sphinx-gallery in parallel of our own gallery
NelleV Mar 9, 2017
ba6d268
DOC added sphinx-gallery as a requirement
NelleV Mar 11, 2017
c908f98
DOC Added readme files to include examples in SG
NelleV Mar 11, 2017
c61c856
DOC SG doesn't support parallel builds yet
NelleV Mar 11, 2017
eaaf182
DOC lines, bars and markers is now full SG
NelleV Mar 11, 2017
4f92501
DOC examples/statistics is fully SG
NelleV Mar 11, 2017
40eab47
DOC pie and polar charts is now full SG
NelleV Mar 11, 2017
9738124
DOC subplots, axes and figures are now full SG
NelleV Mar 11, 2017
8f8d316
DOC added ticks and spines to sphinx-gallery
NelleV Mar 12, 2017
55a5840
DOC image, contours and fields are fully SG compatible
NelleV Mar 16, 2017
9bf91a8
DOC showcase are fully SG compatible
NelleV Mar 16, 2017
f50ab00
DOC text, labels and annotations are fully SG compatible
NelleV Mar 16, 2017
7c79b12
DOC tick and spines is now full SG compatible
NelleV Mar 16, 2017
1ed25aa
DOC shapes and collections is now fully SG compatible
NelleV Mar 17, 2017
8bc4597
DOC mplot3d is fully SG-compatible
NelleV Mar 19, 2017
d5583f8
DOC The gallery is now built with sphinx-gallery
NelleV Mar 19, 2017
8f5f185
DOC all plots in the gallery now produce images
NelleV Mar 19, 2017
9d805a1
DOC API is now fully SG-compatible
NelleV Mar 19, 2017
4a13444
DOC linking to auto_examples when possible
NelleV Mar 19, 2017
8b764e7
DOC FIX nitpicks in the conf file
NelleV Mar 25, 2017
c9b2ad9
Merge branch 'sphinx_gallery' of https://github.com/NelleV/matplotlib…
choldgraf Apr 10, 2017
752cd64
switching to examples_gallery
choldgraf Apr 10, 2017
b571c51
calling it 'gallery'
choldgraf Apr 10, 2017
283f687
Remove plot_ suffix.
anntzer Apr 11, 2017
6763f83
sed source names and manual fixes
anntzer Apr 11, 2017
e01eb8d
Update .gitignore for s-g
anntzer Apr 11, 2017
356815a
Merge pull request #1 from anntzer/cleanup-plot_-prefix
choldgraf Apr 11, 2017
3f1ba02
fixing a couple links
choldgraf Apr 11, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DOC The gallery is now built with sphinx-gallery
:D
  • Loading branch information
NelleV committed Apr 6, 2017
commit d5583f89021b88c1cebdd74cc011bb1cf0645a7c
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions doc/_templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion doc/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/devel/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
170 changes: 0 additions & 170 deletions doc/sphinxext/gen_gallery.py

This file was deleted.