From 30c8729f782c0c13ca872260085d5b7b7c37df61 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 22 Jun 2017 15:26:16 -0400 Subject: [PATCH] switch from oslosphinx to openstackdocstheme Change-Id: Ie45909df0b5a118d0200a1ee71277f4dbfe41d08 Signed-off-by: Doug Hellmann --- doc/source/conf.py | 5 ++++- releasenotes/source/conf.py | 5 +++-- test-requirements.txt | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 208517c..82f27c3 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -15,6 +15,8 @@ import os import sys +import openstackdocstheme + sys.path.insert(0, os.path.abspath('../..')) # -- General configuration ---------------------------------------------------- @@ -23,7 +25,6 @@ sys.path.insert(0, os.path.abspath('../..')) extensions = [ 'sphinx.ext.autodoc', #'sphinx.ext.intersphinx', - 'oslosphinx', 'reno.sphinxext' ] @@ -58,6 +59,8 @@ pygments_style = 'sphinx' # html_theme_path = ["."] # html_theme = '_theme' # html_static_path = ['static'] +html_theme = 'openstackdocs' +html_theme_path = [openstackdocstheme.get_html_theme_path()] # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index e33ee8e..1d03656 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -21,12 +21,12 @@ # If your documentation needs a minimal Sphinx version, state it here. #needs_sphinx = '1.0' +import openstackdocstheme # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'oslosphinx', 'reno.sphinxext', ] @@ -100,7 +100,7 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' +html_theme = 'openstackdocs' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -109,6 +109,7 @@ html_theme = 'default' # Add any paths that contain custom themes here, relative to this directory. #html_theme_path = [] +html_theme_path = [openstackdocstheme.get_html_theme_path()] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". diff --git a/test-requirements.txt b/test-requirements.txt index e71d004..5fc33b0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ mock>=1.2 python-glanceclient>=0.18.0 python-subunit>=0.0.18 sphinx>=1.5.1 # BSD -oslosphinx>=4.7.0 # Apache-2.0 +openstackdocstheme>=1.5.0 # Apache-2.0 oslotest>=1.5.1,<1.6.0 # Apache-2.0 reno>=0.1.1 # Apache2 testrepository>=0.0.18