Update sphinx to 1.3

Version 1.3 bundles Napoleon, and requires RTD_theme >= 0.18
unbrice · May 23, 2015 · 5d379d2 · 5d379d2
1 parent 54b3d3c
commit 5d379d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build-requirements.txt b/build-requirements.txt
@@ -1,5 +1,4 @@
 mock
-sphinx>=1.2
+sphinx>=1.3
 sphinx_rtd_theme
-sphinxcontrib-napoleon
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -10,7 +10,7 @@
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.3'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -19,9 +19,9 @@
     'sphinx.ext.autodoc',
     'sphinx.ext.autosummary',
     'sphinx.ext.intersphinx',
-    'sphinxcontrib.napoleon',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
+    'sphinx.ext.napoleon',
     'sphinx.ext.viewcode',
 ]