From cb2f8a3e7560a23294a35ce0312ed91fc76cf99b Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 31 May 2020 20:19:49 +0200 Subject: [PATCH] Switch to newer openstackdocstheme version Switch to openstackdocstheme 2.2.1 version. Using this version will allow especially: * Linking from HTML to PDF document * Allow parallel building of documents * Fix some rendering problems Update Sphinx version as well. openstackdocstheme renames some variables, so follow the renames before the next release removes them. A couple of variables are also not needed anymore, remove them. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: I666adb3c053b914d81790c56e08fd2ce9f6a7d1a --- deploy-guide/source/conf.py | 6 +++--- requirements.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 49d3a78..fa2f319 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -54,9 +54,9 @@ master_doc = 'index' copyright = u'2016, OpenStack contributors' # Settings for openstackdocstheme -repository_name = 'openstack/charm-deployment-guide' -bug_project = 'charm-deployment-guide' -bug_tag = u'deployment-guide' +openstackdocs_repo_name = 'openstack/charm-deployment-guide' +openstackdocs_bug_project = 'charm-deployment-guide' +openstackdocs_bug_tag = u'deployment-guide' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/requirements.txt b/requirements.txt index 3a1ae93..4964b0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 -sphinx>=1.8.0,!=2.1.0 # BSD -openstackdocstheme>=1.30.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0