Merge pull request pysal#47 from weikang9009/rel2.0

sjsrey · web-flow · commit 704a45ed0bc8 · 2018-12-29T09:55:28.000-08:00
change napoleon to numpydoc for docstring support in Sphinx
diff --git a/doc/Makefile b/doc/Makefile
@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = PACKAGE_NAME
+SPHINXPROJ    = pysal
 SOURCEDIR     = .
 BUILDDIR      = _build
 
diff --git a/doc/conf.py b/doc/conf.py
@@ -42,7 +42,8 @@
               'sphinx.ext.mathjax',
               'sphinx.ext.doctest',
               'sphinx.ext.intersphinx',
-              'sphinx.ext.napoleon',
+              'numpydoc',
+              #'sphinx.ext.napoleon',
               'matplotlib.sphinxext.plot_directive']
 
 
diff --git a/doc/make.bat b/doc/make.bat
@@ -9,7 +9,7 @@ if "%SPHINXBUILD%" == "" (
 )
 set SOURCEDIR=.
 set BUILDDIR=_build
-set SPHINXPROJ=PACKAGE_NAME
+set SPHINXPROJ=pysal
 
 if "%1" == "" goto help
 
