From 41af4ca8f3cd3db8dc076c07e1a082a053b91b26 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 11 Sep 2017 21:54:33 +0800 Subject: [PATCH] doc: switch to upstream sphinx-ditaa it works with setuptools and is now compatible with py3 the py3 branch is created to track the upstream's master branch Signed-off-by: Kefu Chai (cherry picked from commit fda079d5ed4c8a80c677f714a680233a568d512e) --- admin/doc-requirements.txt | 2 +- doc/conf.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt index 3990b2f31bdc9..dc14113035d24 100644 --- a/admin/doc-requirements.txt +++ b/admin/doc-requirements.txt @@ -1,3 +1,3 @@ Sphinx == 1.6.3 --e git+https://github.com/ceph/sphinx-ditaa.git#egg=sphinx-ditaa +-e git+https://github.com/ceph/sphinx-ditaa.git@py3#egg=sphinx-ditaa -e git+https://github.com/michaeljones/breathe#egg=breathe diff --git a/doc/conf.py b/doc/conf.py index 49b6ecde29e24..a1968bb4c1476 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -41,9 +41,10 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.graphviz', 'sphinx.ext.todo', - 'sphinx_ditaa', + 'sphinxcontrib.ditaa', 'breathe', ] +ditaa = 'ditaa' todo_include_todos = True top_level = os.path.dirname( -- 2.39.5