Merge "[api-ref] Remove temporary block in conf.py"

This commit is contained in:
Jenkins 2016-09-26 09:13:47 +00:00 committed by Gerrit Code Review
commit 0a8fe0b7be

View File

@ -28,35 +28,17 @@ import os
import subprocess import subprocess
import sys import sys
# TODO(Graham Hayes): Remove the following block of code when os-api-ref is import openstackdocstheme
# using openstackdocstheme
import os_api_ref html_theme = 'openstackdocs'
html_theme_path = [openstackdocstheme.get_html_theme_path()]
html_theme_options = {
"sidebar_mode": "toc",
}
if getattr(os_api_ref, 'THEME', 'olsosphinx') == 'openstackdocstheme': extensions = [
# We are on the new version with openstackdocstheme support 'os_api_ref',
]
extensions = [
'os_api_ref',
]
import openstackdocstheme # noqa
html_theme = 'openstackdocs'
html_theme_path = [openstackdocstheme.get_html_theme_path()]
html_theme_options = {
"sidebar_mode": "toc",
}
else:
# We are on the old version without openstackdocstheme support
extensions = [
'os_api_ref',
'oslosphinx',
]
# End temporary block
# If extensions (or modules to document with autodoc) are in another directory, # 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 # add these directories to sys.path here. If the directory is relative to the