From 9c282d47babb1eb8a1e424195268bb69aa00660d Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 15 May 2019 08:14:34 -0500 Subject: [PATCH] Move from oslosphinx to openstackdocstheme The oslosphinx package is no longer supported. Jobs should also be moved to run with Python 3. Change-Id: I13aa6e89dc0752157cf9efc66844c5141f3b77ce Signed-off-by: Sean McGinnis --- .gitignore | 1 + doc/source/conf.py | 4 ++-- requirements.txt | 2 +- tox.ini | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dfe851d..22a1a33 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ output/*/index.html # Sphinx doc/build +doc/source/spelling_wordlist.txt # pbr generates these AUTHORS diff --git a/doc/source/conf.py b/doc/source/conf.py index 89d013c..7b63b95 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -24,8 +24,7 @@ sys.path.insert(0, os.path.abspath('../..')) extensions = [ 'sphinx.ext.autodoc', 'sphinxcontrib.blockdiag', - #'sphinx.ext.intersphinx', - 'oslosphinx', + 'openstackdocstheme', 'yasfb', ] @@ -76,6 +75,7 @@ pygments_style = 'sphinx' # html_theme_path = ["."] # html_theme = '_theme' # html_static_path = ['static'] +html_theme = 'openstackdocs' # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project diff --git a/requirements.txt b/requirements.txt index cfd826a..cd19cc9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ pbr!=2.1.0,>2.0.0 # Apache-2.0 -oslosphinx>=4.7.0 # Apache-2.0 +openstackdocstheme>=1.18.1 # Apache-2.0 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD sphinxcontrib-blockdiag==1.5.4 # BSD diff --git a/tox.ini b/tox.ini index be6cbbb..437e100 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = docs skipsdist = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -U {opts} {packages} setenv =