summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorDavid Stanek <dstanek@dstanek.com>2014-09-15 18:38:25 +0000
committerDavid Stanek <dstanek@dstanek.com>2015-05-07 03:12:18 +0000
commit045e47938f445741b6efedeb7243d3b413ea3229 (patch)
treed68a24a596a27c1e9d16668fa262532b3cb56bc5 /doc/source
parent39b7f963f595ba3517c7e5540981bce356ec0e1b (diff)
downloadpython-keystoneclient-045e47938f445741b6efedeb7243d3b413ea3229.tar.gz
Removes temporary fix for doc generation
A temporary fix was added to get around a bug in how pbr handles its autodoc_tree_index_modules setting. Since this bug is fixed we no longer need the work around. Change-Id: Id8274ef5c244bf50a34702ed9b4e50d3b82d8028 Closes-Bug: #1260495
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f256fd4..4e238aa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,12 +23,6 @@ import pbr.version
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', '..')))
-# NOTE(blk-u): Path for our Sphinx extension, remove when
-# https://launchpad.net/bugs/1260495 is fixed.
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
- '..')))
-
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -44,10 +38,6 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.coverage',
'sphinx.ext.intersphinx',
'oslosphinx',
- # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
- # remove this Sphinx extension when
- # https://launchpad.net/bugs/1260495 is fixed.
- 'ext.apidoc',
]
todo_include_todos = True