summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-18 21:38:55 +0000
committerGerrit Code Review <review@openstack.org>2017-07-18 21:38:55 +0000
commit555ba5ed690027088358288c9b0252d5a58bdc0d (patch)
treece4ccb89d4952b61d45b5cd02ab812e043956cad
parent5391033cb087d55e82ddb26893bef14f9b3d890c (diff)
parentb9a20edf926887827310d1e69b103bac92e2d4a5 (diff)
Merge "Update the trove docs to follow the docs theme"2.11.0
-rw-r--r--doc/source/conf.py10
-rw-r--r--releasenotes/source/conf.py11
-rw-r--r--test-requirements.txt2
3 files changed, 18 insertions, 5 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 09867dc..0f7099a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,9 +31,16 @@ extensions = [
31 'sphinx.ext.autodoc', 31 'sphinx.ext.autodoc',
32 'sphinx.ext.doctest', 32 'sphinx.ext.doctest',
33 'sphinx.ext.coverage', 33 'sphinx.ext.coverage',
34 'oslosphinx' 34 'openstackdocstheme',
35] 35]
36 36
37# openstackdocstheme options
38repository_name = 'openstack/python-troveclient'
39bug_project = 'python-troveclient'
40bug_tag = ''
41html_last_updated_fmt = '%Y-%m-%d %H:%M'
42html_theme = 'openstackdocs'
43
37templates_path = ['_templates'] 44templates_path = ['_templates']
38 45
39source_suffix = '.rst' 46source_suffix = '.rst'
@@ -47,7 +54,6 @@ exclude_trees = []
47 54
48pygments_style = 'sphinx' 55pygments_style = 'sphinx'
49 56
50html_theme = 'default'
51htmlhelp_basename = 'python-troveclientdoc' 57htmlhelp_basename = 'python-troveclientdoc'
52latex_documents = [ 58latex_documents = [
53 ('index', 'python-troveclient.tex', u'python-troveclient Documentation', 59 ('index', 'python-troveclient.tex', u'python-troveclient Documentation',
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 847ffac..53f88e2 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -30,10 +30,17 @@ import os
30# ones. 30# ones.
31extensions = [] 31extensions = []
32extensions = [ 32extensions = [
33 'oslosphinx', 33 'openstackdocstheme',
34 'reno.sphinxext', 34 'reno.sphinxext',
35] 35]
36 36
37
38# openstackdocstheme options
39repository_name = 'openstack/python-troveclient'
40bug_project = 'python-troveclient'
41bug_tag = ''
42html_last_updated_fmt = '%Y-%m-%d %H:%M'
43
37# Add any paths that contain templates here, relative to this directory. 44# Add any paths that contain templates here, relative to this directory.
38templates_path = ['_templates'] 45templates_path = ['_templates']
39 46
@@ -104,7 +111,7 @@ pygments_style = 'sphinx'
104 111
105# The theme to use for HTML and HTML Help pages. See the documentation for 112# The theme to use for HTML and HTML Help pages. See the documentation for
106# a list of builtin themes. 113# a list of builtin themes.
107html_theme = 'default' 114html_theme = 'openstackdocs'
108 115
109# Theme options are theme-specific and customize the look and feel of a theme 116# Theme options are theme-specific and customize the look and feel of a theme
110# further. For a list of options available for each theme, see the 117# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
index 6c2e213..bcdc7b3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
4hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 4hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
5coverage!=4.4,>=4.0 # Apache-2.0 5coverage!=4.4,>=4.0 # Apache-2.0
6fixtures>=3.0.0 # Apache-2.0/BSD 6fixtures>=3.0.0 # Apache-2.0/BSD
7oslosphinx>=4.7.0 # Apache-2.0
8oslotest>=1.10.0 # Apache-2.0 7oslotest>=1.10.0 # Apache-2.0
9python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0 8python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
10requests-mock>=1.1 # Apache-2.0 9requests-mock>=1.1 # Apache-2.0
@@ -16,3 +15,4 @@ mock>=2.0 # BSD
16httplib2>=0.7.5 # MIT 15httplib2>=0.7.5 # MIT
17pycrypto>=2.6 # Public Domain 16pycrypto>=2.6 # Public Domain
18reno!=2.3.1,>=1.8.0 # Apache-2.0 17reno!=2.3.1,>=1.8.0 # Apache-2.0
18openstackdocstheme>=1.11.0 # Apache-2.0