commit 5ed3e53ebaf103dc0693e61825b1d5333730aa98 Author: Isis Lovecruft isis@torproject.org Date: Thu Nov 2 01:22:30 2017 +0000
Fix Sphinx documentation to build with newer dependencies. --- doc/sphinx/source/bridgedb.distributors.email.rst | 15 +++++++++++++++ doc/sphinx/source/bridgedb.distributors.https.rst | 12 ++++++++++++ doc/sphinx/source/bridgedb.email.rst | 15 --------------- doc/sphinx/source/bridgedb.https.rst | 12 ------------ doc/sphinx/source/bridgedb.rst | 6 +++--- doc/sphinx/source/conf.py | 2 -- 6 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/doc/sphinx/source/bridgedb.distributors.email.rst b/doc/sphinx/source/bridgedb.distributors.email.rst new file mode 100644 index 0000000..ed94065 --- /dev/null +++ b/doc/sphinx/source/bridgedb.distributors.email.rst @@ -0,0 +1,15 @@ +.. _email-pkg: + +bridgedb.distributors.email +---------------------------- + +.. contents:: bridgedb.distributors.email + :depth: 3 + +.. automodule:: bridgedb.distributors.email.__init__ +.. automodule:: bridgedb.distributors.email.autoresponder +.. automodule:: bridgedb.distributors.email.distributor +.. automodule:: bridgedb.distributors.email.dkim +.. automodule:: bridgedb.distributors.email.request +.. automodule:: bridgedb.distributors.email.server +.. automodule:: bridgedb.distributors.email.templates diff --git a/doc/sphinx/source/bridgedb.distributors.https.rst b/doc/sphinx/source/bridgedb.distributors.https.rst new file mode 100644 index 0000000..f58dd70 --- /dev/null +++ b/doc/sphinx/source/bridgedb.distributors.https.rst @@ -0,0 +1,12 @@ +.. _https-pkg: + +bridgedb.distributors.https +---------------------------- + +.. contents:: bridgedb.distributors.https + :depth: 3 + +.. automodule:: bridgedb.distributors.https.__init__ +.. automodule:: bridgedb.distributors.https.distributor +.. automodule:: bridgedb.distributors.https.request +.. automodule:: bridgedb.distributors.https.server diff --git a/doc/sphinx/source/bridgedb.email.rst b/doc/sphinx/source/bridgedb.email.rst deleted file mode 100644 index 020b614..0000000 --- a/doc/sphinx/source/bridgedb.email.rst +++ /dev/null @@ -1,15 +0,0 @@ -.. _email-pkg: - -bridgedb.email --------------- - -.. contents:: bridgedb.email - :depth: 3 - -.. automodule:: bridgedb.email.__init__ -.. automodule:: bridgedb.email.autoresponder -.. automodule:: bridgedb.email.distributor -.. automodule:: bridgedb.email.dkim -.. automodule:: bridgedb.email.request -.. automodule:: bridgedb.email.server -.. automodule:: bridgedb.email.templates diff --git a/doc/sphinx/source/bridgedb.https.rst b/doc/sphinx/source/bridgedb.https.rst deleted file mode 100644 index 36fa6c6..0000000 --- a/doc/sphinx/source/bridgedb.https.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. _https-pkg: - -bridgedb.https ---------------- - -.. contents:: bridgedb.https - :depth: 3 - -.. automodule:: bridgedb.https.__init__ -.. automodule:: bridgedb.https.distributor -.. automodule:: bridgedb.https.request -.. automodule:: bridgedb.https.server diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index ea04ef4..1f272b3 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -14,12 +14,12 @@ Packages & Modules bridgedb.configure bridgedb.distribute bridgedb.crypto - bridgedb.email + bridgedb.distributors.email + bridgedb.distributors.https bridgedb.filters bridgedb.geo - bridgedb.https bridgedb.interfaces - bridgedb.Main + bridgedb.main bridgedb.parse bridgedb.persistent bridgedb.proxy diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index a50da1e..e98d2b2 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -117,8 +117,6 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', - 'sphinxjp.themecore', - 'sphinxarg.ext', 'sphinxcontrib.fulltoc', 'repoze.sphinx.autointerface', 'apilinks_sphinxext',