Merge pull request #54 from hoechenberger/sphinx

DOC: Remove sphinxcontrib-napoleon dependency
hoechenberger · Mar 7, 2016 · dcabee8 · dcabee8
2 parents 3587fc0 + 5c25a11
commit dcabee8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -68,7 +68,7 @@ def __getattr__(cls, name):
     # 'sphinx.ext.todo',
     'sphinx.ext.viewcode',
     # 'numpydoc',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
 ]
 
 autodoc_default_flags = [

diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -1,3 +1,3 @@
-sphinxcontrib-napoleon
+sphinx >= 1.3.0
 psychopy
 -e .
diff --git a/requirements.txt b/requirements.txt
@@ -6,5 +6,5 @@ scipy
 pyfftw
 git+https://github.com/pearu/pylibnidaqmx.git
 git+https://github.com/psychopy/psychopy.git@1.82.02rc1#egg=psychopy
-sphinxcontrib-napoleon
+sphinx >= 1.3.0
 -e .
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     extras_require = {
         'hardware':  ['psychopy', 'pylibnidaqmx'],
         'image': ['pyfftw', 'scipy', 'matplotlib', 'pillow'],
-        'doc': ['sphinxcontrib-napoleon'],
+        'doc': ['sphinx'],
     },
     classifiers=['Intended Audience :: Science/Research',
                  'Programming Language :: Python',