[MRG] update numpydoc to upstream, include fix for line numbers (scik…

…it-learn#7355)
cssd1983 · Jul 18, 2017 · 71408e0 · 71408e0
1 parent 8cee70d
commit 71408e0
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 1,096 deletions.
diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh
@@ -109,6 +109,7 @@ conda update --yes --quiet conda
 conda create -n $CONDA_ENV_NAME --yes --quiet python numpy scipy \
   cython nose coverage matplotlib sphinx=1.6.2 pillow
 source activate testenv
+pip install numpydoc
 
 # Build and install scikit-learn in dev mode
 python setup.py develop

diff --git a/doc/conf.py b/doc/conf.py
@@ -32,12 +32,17 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc', 'sphinx.ext.autosummary',
-    'numpy_ext.numpydoc',
+    'numpydoc',
     'sphinx.ext.linkcode', 'sphinx.ext.doctest',
     'sphinx_gallery.gen_gallery',
     'sphinx_issues',
 ]
 
+# this is needed for some reason...
+# see https://github.com/numpy/numpydoc/issues/69
+numpydoc_class_members_toctree = False
+
+
 # pngmath / imgmath compatibility layer for different sphinx versions
 import sphinx
 from distutils.version import LooseVersion

diff --git a/doc/sphinxext/LICENSE.txt b/doc/sphinxext/LICENSE.txt
diff --git a/doc/sphinxext/README.txt b/doc/sphinxext/README.txt
diff --git a/doc/sphinxext/numpy_ext/__init__.py b/doc/sphinxext/numpy_ext/__init__.py