summaryrefslogtreecommitdiff
path: root/api-ref/source
diff options
context:
space:
mode:
authorNguyen Phuong An <AnNP@vn.fujitsu.com>2016-09-07 13:18:30 +0700
committerNguyen Phuong An <AnNP@vn.fujitsu.com>2016-09-07 07:25:45 +0000
commit29734db6d91e5080e07515bbaba0cc2a9590310e (patch)
treeed38099401349b5db75d78a80dabe13d974ee314 /api-ref/source
parent49226daee01c1cca4b289f6511fa80b257ee259b (diff)
downloadheat-29734db6d91e5080e07515bbaba0cc2a9590310e.tar.gz
[api-ref] Remove temporary block in conf.py
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 Change-Id: I33120c4c93fd976add6e9f52ef306cc3d050f162
Diffstat (limited to 'api-ref/source')
-rw-r--r--api-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 2e2d1d298..50ad78447 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -30,35 +30,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
+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':
- # 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',
- ]
-
-# End temporary block
+extensions = [
+ 'os_api_ref',
+]
# 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