From: Kefu Chai <kchai@redhat.com>
Date: Mon, 11 Sep 2017 13:54:33 +0000 (+0800)
Subject: doc: switch to upstream sphinx-ditaa
X-Git-Tag: v13.0.1~954^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fda079d5ed4c8a80c677f714a680233a568d512e;p=ceph.git

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>
---

diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index 3990b2f31bdc..dc14113035d2 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 a1330f7996f1..d2008e49905a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -43,9 +43,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(