Merge branch 'master' of github.com:sfstoolbox/theory

* 'master' of github.com:sfstoolbox/theory: Switch RTD python setup to conda
sfstoolbox · Mar 3, 2017 · 9acdd8b · 9acdd8b
2 parents a1b2dbe + e3eb042
commit 9acdd8b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 857 deletions.
diff --git a/conf.py b/conf.py
@@ -26,11 +26,7 @@
 	'sphinx.ext.autodoc',
 	'sphinx.ext.viewcode',
         'mathjax', # modified version to include clickable eq numbers
-        'plot_directive',  # temporary, for :context:close-figs feature
-        # When matplotlib > 1.4.3 is available on readthedocs, we can use this:
-        #'matplotlib.sphinxext.plot_directive',
-	#'matplotlib.sphinxext.only_directives',
-	#'matplotlib.sphinxext.plot_directive',
+        'matplotlib.sphinxext.plot_directive'
 ]
 
 # Enable numbering of figures and tables