summaryrefslogtreecommitdiff
path: root/doc/source/conf.py
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2010-09-28 12:11:38 +0200
committerPauli Virtanen <pav@iki.fi>2010-10-01 12:13:21 +0200
commit6716be40b753daff7d705fcd440bd9e67198cff2 (patch)
treec22fa123a1b8e6ad2a9a827b840c7f9603b8f2be /doc/source/conf.py
parent4510c4a81185eed7e144f75ec5121f80bc924a6e (diff)
downloadnumpy-6716be40b753daff7d705fcd440bd9e67198cff2.tar.gz
DOC: explicitly require Sphinx >= 1.0.1
Diffstat (limited to 'doc/source/conf.py')
-rw-r--r--doc/source/conf.py19
1 files changed, 7 insertions, 12 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 59bf3e909..4dfec91db 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -4,8 +4,10 @@ import sys, os, re
# Check Sphinx version
import sphinx
-if sphinx.__version__ < "0.5":
- raise RuntimeError("Sphinx 0.5.dev or newer required")
+if sphinx.__version__ < "1.0.1":
+ raise RuntimeError("Sphinx 1.0.1 or newer required")
+
+needs_sphinx = '1.0'
# -----------------------------------------------------------------------------
# General configuration
@@ -18,15 +20,9 @@ sys.path.insert(0, os.path.abspath('../sphinxext'))
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath', 'numpydoc',
'sphinx.ext.intersphinx', 'sphinx.ext.coverage',
- 'sphinx.ext.doctest',
+ 'sphinx.ext.doctest', 'sphinx.ext.autosummary',
'plot_directive']
-if sphinx.__version__ >= "0.7":
- extensions.append('sphinx.ext.autosummary')
-else:
- extensions.append('autosummary')
- extensions.append('only_directives')
-
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -222,9 +218,8 @@ numpydoc_use_plots = True
# Autosummary
# -----------------------------------------------------------------------------
-if sphinx.__version__ >= "0.7":
- import glob
- autosummary_generate = glob.glob("reference/*.rst")
+import glob
+autosummary_generate = glob.glob("reference/*.rst")
# -----------------------------------------------------------------------------
# Coverage checker