DOC: clean up old sphinx extension machinery

We were carrying old copy of sphinx extensions. They are now all in Debian stable (squeeze) which is soon to be replaced by Debian Wheezy, so time to drop the old extension code. Switch from matplotib 'htmlonly' directive to sphinx's own 'only' directive.
nipy · matthew-brett · Jul 22, 2012 · Jul 20, 2012 · Jul 20, 2012 · Jul 20, 2012
commit 74468738c7458fc1d562714619383d3ea155a27c
diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -4,7 +4,7 @@
  API
 #####
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/conf.py b/doc/conf.py
@@ -34,44 +34,15 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc',
               'sphinx.ext.doctest',
+              'sphinx.ext.pngmath',
               'sphinx.ext.autosummary',
-              'ipython_console_highlighting', 
-              'inheritance_diagram', 
+              'inheritance_diagram',
+              'numpy_ext.numpydoc',
+              'matplotlib.sphinxext.plot_directive',
               ]
 
-# Current version (as of 11/2010) of numpydoc is only compatible with sphinx >
-# 1.0.  We keep copies of this version in 'numpy_ext'.  For a while we will also
-# keep a copy of the older numpydoc version to allow compatibility with sphinx
-# 0.6
-try:
-    # With older versions of sphinx, this causes a crash
-    import numpy_ext.numpydoc
-except ImportError:
-    # Older version of sphinx
-    extensions.append('numpy_ext_old.numpydoc')
-else: # probably sphinx >= 1.0
-    extensions.append('numpy_ext.numpydoc')
-    autosummary_generate=True
-
-# Matplotlib sphinx extensions
-# ----------------------------
-
-# Currently we depend on some matplotlib extentions that are only in
-# the trunk, so we've added copies of these files to fall back on,
-# since most people install releases.  Once theses extensions have
-# been released for a while we should remove this hack.  I'm assuming
-# any modifications to these extensions will be done upstream in
-# matplotlib!  The matplotlib trunk will have more bug fixes and
-# feature updates so we'll try to use that one first.
-try:
-    import matplotlib.sphinxext
-    extensions.append('matplotlib.sphinxext.mathmpl')
-    extensions.append('matplotlib.sphinxext.only_directives')
-    extensions.append('matplotlib.sphinxext.plot_directive')
-except ImportError:
-    extensions.append('mathmpl')
-    extensions.append('only_directives')
-    extensions.append('plot_directive')
+# Autosummary on
+autosummary_generate=True
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -84,8 +55,9 @@
 
 # General substitutions.
 project = 'nipy'
-#copyright = ':ref:`2005-2010, Neuroimaging in Python team. <nipy-software-license>`' 
-copyright = '2005-2010, Neuroimaging in Python team' 
+
+#copyright = ':ref:`2005-2010, Neuroimaging in Python team. <nipy-software-license>`'
+copyright = '2005-2012, Neuroimaging in Python team'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.

diff --git a/doc/devel/guidelines/index.rst b/doc/devel/guidelines/index.rst
@@ -4,7 +4,7 @@
  Development Guidelines
 ========================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/index.rst b/doc/devel/index.rst
@@ -4,7 +4,7 @@
  Developer Guide
 =================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/install/index.rst b/doc/devel/install/index.rst
@@ -4,7 +4,7 @@
  Developer installs for different distributions
 ================================================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/planning/index.rst b/doc/devel/planning/index.rst
@@ -4,7 +4,7 @@
  Development Planning
 ======================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/software_design/comparisons/index.rst b/doc/devel/software_design/comparisons/index.rst
@@ -4,7 +4,7 @@
  Software Design
 =================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/software_design/index.rst b/doc/devel/software_design/index.rst
@@ -4,7 +4,7 @@
  Software Design
 =================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/devel/tools/index.rst b/doc/devel/tools/index.rst
@@ -4,7 +4,7 @@
  Developer Tools
 =================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|

diff --git a/doc/documentation.rst b/doc/documentation.rst
@@ -4,7 +4,7 @@
  NIPY documentation
 ====================
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|
@@ -24,7 +24,7 @@
    publications
    license
 
-.. htmlonly::
+.. only:: html
 
   * :ref:`genindex`
   * :ref:`modindex`

diff --git a/doc/faq/index.rst b/doc/faq/index.rst
@@ -4,7 +4,7 @@
  FAQ
 =====
 
-.. htmlonly::
+.. only:: html
 
    :Release: |version|
    :Date: |today|
@@ -15,5 +15,5 @@
    :maxdepth: 2
 
    why
-   licensing   
-   documentation_faq   
+   licensing
+   documentation_faq
diff --git a/doc/sphinxext/README.txt b/doc/sphinxext/README.txt
@@ -6,19 +6,11 @@ Thesea are a few sphinx extensions we are using to build the nipy
 documentation.  In this file we list where they each come from, since we intend
 to always push back upstream any modifications or improvements we make to them.
 
-It's worth noting that some of these are being carried (as copies) by more
-than one project.  Hopefully once they mature a little more, they will be
-incorproated back into sphinx itself, so that all projects can use a common
-base.
-
 * From matploltlib:
   * inheritance_diagram.py
-  * ipython_console_highlighting.py
-  * mathmpl.py
-  * only_directives.py
-  * plot_directive.py
 
 * From numpy:
-  * docscrape.py
-  * docscrape_sphinx.py
-  * numpydoc.py
+  * numpy_ext
+
+* From ipython
+  * ipython_console_highlighting