Merge branch 'master' into i468

econ-ark · Jan 30, 2020 · 6d6bbec · 6d6bbec
2 parents 29bfd31 + 46d747a
commit 6d6bbec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/Documentation/conf.py b/Documentation/conf.py
@@ -39,7 +39,7 @@
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
     'sphinx.ext.autosummary',
-    'numpydoc',
+    'sphinx.ext.napoleon',
     'nbsphinx',
     'recommonmark'
 ]

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 numpy
 matplotlib
 sphinx==1.6.7
-numpydoc
 future
 joblib
 dill

diff --git a/setup.py b/setup.py
@@ -159,7 +159,6 @@
             'future',  # Optional
             'Sphinx<=1.6.7',
             'nbsphinx',
-            'numpydoc',
             'recommonmark'
     ]},