From 78dc56d97947537b32fc61cceaafefd525c27de0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 15 May 2020 08:50:51 +0200 Subject: [PATCH] Update docstheme With version 2.1, we renamed options in the extension, let's use them here as well. Increase also requirements for reno and Sphinx. Change-Id: Ica3cc991ad7bcc1626b805ede57c9c23e2538239 --- api-ref/source/conf.py | 4 ++-- doc/requirements.txt | 2 +- doc/source/conf.py | 6 +++--- test-requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 59c693a9..7c9e5d65 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -63,8 +63,8 @@ version = '1.0' release = '1.0' # A few variables have to be set for the log-a-bug feature. -bug_tag = "doc-builds" -bug_project = 'openstack-doc-tools' +openstackdocs_bug_tag = "doc-builds" +openstackdocs_bug_project = 'openstack-doc-tools' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/requirements.txt b/doc/requirements.txt index 303fd926..fabcc7e1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -8,4 +8,4 @@ # docs. os-api-ref>=1.4.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 9323cf42..e0154cb7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,9 +10,9 @@ extensions = ['openstackdocstheme'] # openstackdocstheme options -repository_name = 'openstack/openstackdocstheme' -bug_project = 'openstack-doc-tools' -bug_tag = 'openstackdocstheme' +openstackdocs_repo_name = 'openstack/openstackdocstheme' +openstackdocs_bug_project = 'openstack-doc-tools' +openstackdocs_bug_tag = 'openstackdocstheme' # The suffix of source filenames. source_suffix = '.rst' diff --git a/test-requirements.txt b/test-requirements.txt index dacd5ea9..9773b210 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,4 +5,4 @@ hacking>=3.0,<3.1.0 # Apache-2.0 # this is required for the docs build jobs -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx>=2.0.0,!=2.1.0 # BSD