diff --git a/setup.py b/setup.py index b4b6515c..a33f46c2 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ testing=['nose', 'nose-cov', 'sklearn', 'coverage', 'coveralls', 'python-coveralls'], docs=[ 'Sphinx', 'numpydoc', 'sphinx_autodoc_annotation', 'sphinx_rtd_theme', - 'bibtex-pygments-lexer' + 'bibtex-pygments-lexer', 'matplotlib' ] ), license='LGPLv3' diff --git a/sphinx/conf.py b/sphinx/conf.py index c375d5ee..b5422edd 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -35,8 +35,7 @@ 'sphinx.ext.intersphinx', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.mathjax', 'sphinx.ext.autosummary', 'sphinx.ext.viewcode', 'sphinx.ext.graphviz', 'sphinx.ext.inheritance_diagram', 'sphinx_autodoc_annotation', - 'matplotlib.sphinxext.only_directives', 'matplotlib.sphinxext.plot_directive', - 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'numpydoc' + 'matplotlib.sphinxext.plot_directive', 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'numpydoc' ] intersphinx_mapping = {