summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-27 13:44:12 +0000
committerGerrit Code Review <review@openstack.org>2017-04-27 13:44:13 +0000
commitdf95641103c320752da81bb35488ec6cac2173f3 (patch)
treec01fca091dd1e2a0861e5c6aba4e1a00ad213f29
parent53681bec0c7340d8b9551da1cf09f38901319d42 (diff)
parentebd9ae850a18b26f37738a67b7e528896b249e40 (diff)
Merge "Make oslosphinx optional"
-rw-r--r--doc/source/conf.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 31003c1..f0a78ec 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -8,8 +8,14 @@ sys.path.insert(0, os.path.abspath('../..'))
8 8
9# Add any Sphinx extension module names here, as strings. They can be 9# Add any Sphinx extension module names here, as strings. They can be
10# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. 10# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
11extensions = ['sphinx.ext.autodoc', 11extensions = ['sphinx.ext.autodoc']
12 'oslosphinx'] 12# make oslosphinx optional to not increase the needed dependencies
13try:
14 import oslosphinx
15except ImportError:
16 pass
17else:
18 extensions.append('oslosphinx')
13 19
14# autodoc generation is a bit aggressive and a nuisance when doing heavy 20# autodoc generation is a bit aggressive and a nuisance when doing heavy
15# text edit cycles. 21# text edit cycles.