summaryrefslogtreecommitdiff
path: root/api-ref
diff options
context:
space:
mode:
authorHa Van Tu <tuhv@vn.fujitsu.com>2016-09-07 12:20:14 +0700
committerHa Van Tu <tuhv@vn.fujitsu.com>2016-09-07 12:20:14 +0700
commitb0170c04d298c3790053bc9a0e3b79c238b5f1b4 (patch)
tree0e2e7749d5043b7bf5fa6d816fd5ba5cdd4256cc /api-ref
parent4d1bea742925f341d48544643c6112437fb26fc4 (diff)
downloadtrove-b0170c04d298c3790053bc9a0e3b79c238b5f1b4.tar.gz
[api-ref] Remove temporary block
The os-api-ref 1.0.0 is out. We can remove the support to older version now. Reference: https://github.com/openstack/senlin/commit/ 6d41feb58dd836d426c9b6f025846dbbf7295097 https://review.openstack.org/#/c/362170/ Change-Id: I4a3697f7f43fdce0620d4faa16166078fe984c25
Diffstat (limited to 'api-ref')
-rwxr-xr-xapi-ref/source/conf.py36
1 files changed, 9 insertions, 27 deletions
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 145ff21e..34b89e55 100755
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -29,35 +29,17 @@ import subprocess
import sys
import warnings
-# TODO(Graham Hayes): Remove the following block of code when os-api-ref is
-# using openstackdocstheme
+import openstackdocstheme
-import os_api_ref
-
-if getattr(os_api_ref, 'THEME', 'olsosphinx') == 'openstackdocstheme':
- # We are on the new version with openstackdocstheme support
-
- 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',
- ]
+extensions = [
+ 'os_api_ref',
+]
-# End temporary block
+html_theme = 'openstackdocs'
+html_theme_path = [openstackdocstheme.get_html_theme_path()]
+html_theme_options = {
+ "sidebar_mode": "toc",
+}
# 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