Bump sphinx version to 1.3.1 to match Read The Docs.

STIXProject · May 29, 2015 · 67adb11 · 67adb11
1 parent 055c6ea
commit 67adb11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,7 +13,7 @@
     'sphinx.ext.ifconfig',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
 ]
 
 intersphinx_mapping = {

diff --git a/setup.py b/setup.py
@@ -25,11 +25,8 @@ def get_version():
 
 extras_require = {
     'docs': [
-        'Sphinx==1.2.1',
-        # TODO: remove when updating to Sphinx 1.3, since napoleon will be
-        # included as sphinx.ext.napoleon
-        'sphinxcontrib-napoleon==0.2.4',
-        'sphinx_rtd_theme==0.1.7',
+        'Sphinx==1.3.1',
+        'sphinx_rtd_theme==0.1.8',
     ],
     'test': [
         'nose==1.3.0',