Merge branch 'master' of github.com:zingale/pyro2 into pyro_class

harpolea · harpolea · commit a0f6b1b0fe63 · 2018-08-06T09:17:26.000-04:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -39,6 +39,8 @@
     'sphinx.ext.autosummary',
     'nbsphinx',
     'numpydoc',
+    'sphinx.ext.inheritance_diagram',
+    'sphinx.ext.graphviz',
     'IPython.sphinxext.ipython_console_highlighting',
     'sphinx.ext.githubpages']
 
diff --git a/docs/source/modules.rst b/docs/source/modules.rst
@@ -25,7 +25,6 @@ pyro2
    plot
    plotvar
    pyro
-   setup
    simulation_null
    swe
    test

-Original file line number
+Diff line change
    plot
    plotvar
    pyro
 -   setup
    simulation_null
    swe
    test