summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVan Hung Pham <hungpv@vn.fujitsu.com>2017-06-29 14:01:36 +0700
committerVan Hung Pham <hungpv@vn.fujitsu.com>2017-06-29 14:53:11 +0700
commit66d45fc53d8773b85eb3239aca53bff01aca939e (patch)
treebdc8e54646e73467f29f1a3d508eda7ba0fadf1e
parentaab54fecfdd9d5890383fe653fa85e3f86a50452 (diff)
Switch from oslosphinx to openstackdocstheme
As part of the docs migration work[0] for Pike we need to switch to use the openstackdocstheme. [0]https://review.openstack.org/#/c/472275/ Change-Id: I7c001fa8f627dc991759e157a802588962af53d9
Notes
Notes (review): Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Code-Review+1: Nguyen Hung Phuong <phuongnh@vn.fujitsu.com> Code-Review+2: Major Hayden <major@mhtx.net> Workflow+1: Major Hayden <major@mhtx.net> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 29 Jun 2017 14:17:38 +0000 Reviewed-on: https://review.openstack.org/478769 Project: openstack/monitorstack Branch: refs/heads/master
-rw-r--r--doc/source/conf.py10
-rw-r--r--releasenotes/source/conf.py9
-rw-r--r--test-requirements.txt3
3 files changed, 12 insertions, 10 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index aa70d6f..a9c5e4b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,8 +23,6 @@
23"""Docs config for monitorstck.""" 23"""Docs config for monitorstck."""
24import os 24import os
25 25
26import openstackdocstheme
27
28import pbr.version 26import pbr.version
29 27
30# If extensions (or modules to document with autodoc) are in another directory, 28# If extensions (or modules to document with autodoc) are in another directory,
@@ -47,7 +45,7 @@ import pbr.version
47# ones. 45# ones.
48extensions = [ 46extensions = [
49 'sphinx.ext.autodoc', 47 'sphinx.ext.autodoc',
50 'oslosphinx', 48 'openstackdocstheme',
51 'sphinxmark' 49 'sphinxmark'
52] 50]
53 51
@@ -133,8 +131,12 @@ html_theme_options = {
133} 131}
134 132
135# Add any paths that contain custom themes here, relative to this directory. 133# Add any paths that contain custom themes here, relative to this directory.
136html_theme_path = [openstackdocstheme.get_html_theme_path()] 134# html_theme_path = ["."]
137 135
136# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
137# using the given strftime format.
138# html_last_updated_fmt = '%b %d, %Y'
139html_last_updated_fmt = '%Y-%m-%d %H:%M'
138 140
139# -- Options for HTMLHelp output ------------------------------------------ 141# -- Options for HTMLHelp output ------------------------------------------
140 142
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index ff5306a..5b4a8ea 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -23,8 +23,6 @@
23"""Release notes for monitorstack.""" 23"""Release notes for monitorstack."""
24import os 24import os
25 25
26import openstackdocstheme
27
28import pbr.version 26import pbr.version
29 27
30# If extensions (or modules to document with autodoc) are in another directory, 28# If extensions (or modules to document with autodoc) are in another directory,
@@ -46,7 +44,7 @@ import pbr.version
46# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom 44# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
47# ones. 45# ones.
48extensions = [ 46extensions = [
49 'oslosphinx', 47 'openstackdocstheme',
50 'reno.sphinxext', 48 'reno.sphinxext',
51] 49]
52 50
@@ -131,8 +129,11 @@ html_theme = 'openstackdocs'
131# html_theme_options = {} 129# html_theme_options = {}
132 130
133# Add any paths that contain custom themes here, relative to this directory. 131# Add any paths that contain custom themes here, relative to this directory.
134html_theme_path = [openstackdocstheme.get_html_theme_path()] 132# html_theme_path = []
135 133
134# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
135# using the given strftime format.
136html_last_updated_fmt = '%Y-%m-%d %H:%M'
136 137
137# -- Options for HTMLHelp output ------------------------------------------ 138# -- Options for HTMLHelp output ------------------------------------------
138 139
diff --git a/test-requirements.txt b/test-requirements.txt
index 5da13ee..87e85cf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,8 +8,7 @@ flake8-import-order==0.11 # LGPLv3
8mock>=2.0 # BSD 8mock>=2.0 # BSD
9 9
10# this is required for the docs build jobs 10# this is required for the docs build jobs
11sphinx>=1.5.1 # BSD 11sphinx>=1.6.2 # BSD
12oslosphinx>=4.7.0 # Apache-2.0
13openstackdocstheme>=1.5.0 # Apache-2.0 12openstackdocstheme>=1.5.0 # Apache-2.0
14doc8 # Apache-2.0 13doc8 # Apache-2.0
15reno>=1.8.0 # Apache-2.0 14reno>=1.8.0 # Apache-2.0