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 <kchai@redhat.com>
(cherry picked from commit fda079d5ed4c8a80c677f714a680233a568d512e)

diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index 3990b2f31bdc904241837d2f33f1c33fb161b481..dc14113035d249acb30de1d11bc15ae8b4c289dd 100644 (file)
--- 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 f1fefe0bc7cbfc5a98346d19e2a6322eb85301ae..3bcc7de62512c4a7f8c99ec2a5f2891cacd56aff 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -27,9 +27,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(