From f3585ef0d05f780943b7cacd7c461a8a1b39eca4 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 9 Apr 2019 17:05:39 +0000 Subject: [PATCH] Switch to openstackdocstheme and latest Sphinx The yasfb 0.8.0 release has stopped supporting older Sphinx versions, but oslosphinx is deprecated and lacks support for Sphinx >=2.0.0. Luckily replacing oslosphinx with openstackdocstheme is trivial, and allows us to uncap Sphinx entirely. Change-Id: I3c372acf3dc3be224f71bb77c47b05a47add78a6 --- doc/source/conf.py | 8 ++++++-- requirements.txt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 87547672..b60171e0 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -25,7 +25,7 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinxcontrib.httpdomain', #'sphinx.ext.intersphinx', - 'oslosphinx', + 'openstackdocstheme', 'yasfb', ] @@ -74,9 +74,13 @@ pygments_style = 'sphinx' # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. # html_theme_path = ["."] -# html_theme = '_theme' +html_theme = 'openstackdocs' # html_static_path = ['static'] +# openstackdocstheme options +repository_name = 'openstack-infra/openstackid' +use_storyboard = True + # Output file base name for HTML help builder. htmlhelp_basename = '%sdoc' % project diff --git a/requirements.txt b/requirements.txt index c2e40782..acceec84 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -oslosphinx -sphinx>=1.1.2,<1.2 +openstackdocstheme +sphinx>=1.1.2 sphinxcontrib-httpdomain yasfb>=0.5.1