Switched from using automodapi to sphinx.ext.autodoc.

tmcclintock · Nov 20, 2017 · 3a3ad4f · 3a3ad4f
1 parent 1e98f4f
commit 3a3ad4f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 55 deletions.
diff --git a/docs/api/cluster_toolkit.bias.bias_at_M.rst b/docs/api/cluster_toolkit.bias.bias_at_M.rst
diff --git a/docs/api/cluster_toolkit.bias.bias_at_R.rst b/docs/api/cluster_toolkit.bias.bias_at_R.rst
diff --git a/docs/api/cluster_toolkit.bias.bias_at_nu.rst b/docs/api/cluster_toolkit.bias.bias_at_nu.rst
diff --git a/docs/api/cluster_toolkit.bias.nu_at_M.rst b/docs/api/cluster_toolkit.bias.nu_at_M.rst
diff --git a/docs/api/cluster_toolkit.bias.nu_at_R.rst b/docs/api/cluster_toolkit.bias.nu_at_R.rst
diff --git a/docs/api/cluster_toolkit.bias.sigma2_at_M.rst b/docs/api/cluster_toolkit.bias.sigma2_at_M.rst
diff --git a/docs/api/cluster_toolkit.bias.sigma2_at_R.rst b/docs/api/cluster_toolkit.bias.sigma2_at_R.rst
diff --git a/docs/cluster_toolkit_full_api.rst b/docs/cluster_toolkit_full_api.rst
@@ -2,5 +2,5 @@
 Comprehensive Cluster Toolkit Reference/API
 ******************************************************
 
-.. automodapi:: cluster_toolkit.bias
-   :no-inheritance-diagram:
+.. automodule:: cluster_toolkit.bias
+   :members:
diff --git a/docs/conf.py b/docs/conf.py
@@ -19,14 +19,13 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('../cluster_toolkit/bias.py'))
-from mock import Mock as MagicMock
-class Mock(MagicMock):
-    @classmethod
-    def __getattr__(cls, name):
-            return MagicMock()
-MOCK_MODULES = ['cluster_toolkit._lib', 'cluster_toolkit._ffi']
-sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
-
+#from mock import Mock as MagicMock
+#class Mock(MagicMock):
+#    @classmethod
+#    def __getattr__(cls, name):
+#            return MagicMock()
+#MOCK_MODULES = ['cluster_toolkit._lib', 'cluster_toolkit._ffi']
+#sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
 
 # -- General configuration ------------------------------------------------
@@ -40,7 +39,7 @@ def __getattr__(cls, name):
 # ones.
 extensions = ['sphinx.ext.todo',
               'sphinx.ext.mathjax',
-              'sphinx_automodapi.automodapi',
+              'sphinx.ext.autodoc',
               'sphinxcontrib.napoleon']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -164,7 +163,7 @@ def __getattr__(cls, name):
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'cluster_wl', u'cluster_toolkit Documentation',
+    (master_doc, 'cluster_toolkit', u'cluster_toolkit Documentation',
      [author], 1)
 ]
 

diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements
@@ -1,2 +1 @@
-sphinx-automodapi
 sphinxcontrib-napoleon