summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-06 15:36:17 +0000
committerGerrit Code Review <review@openstack.org>2020-08-06 15:36:17 +0000
commit9f040d985d38ff587543187a0dfdabaf068bc4f3 (patch)
treeba96e55f4e232c4ef31048e89d38bd2f7969f2fa
parent3f896a8d846de0682e2bfa5a8b45fc235620c7d5 (diff)
parent2242cb652e2ce74a852c6cfd677f1cd000a2cae1 (diff)
downloadpbr-9f040d985d38ff587543187a0dfdabaf068bc4f3.tar.gz
Merge "Support newer openstackdocstheme"
-rw-r--r--doc/source/conf.py9
-rw-r--r--releasenotes/source/conf.py15
2 files changed, 17 insertions, 7 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 13f63a0..aa51538 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -17,10 +17,17 @@ except ImportError:
openstackdocstheme = None
# openstackdocstheme options
+
+# Deprecated options for docstheme < 2.2.0, can be removed once
+# pbr stops supporting py27.
repository_name = 'openstack/pbr'
bug_project = 'pbr'
bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+# New options with openstackdocstheme >=2.2.0
+openstackdocs_repo_name = 'openstack/pbr'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'pbr'
+openstackdocs_bug_tag = ''
# autodoc generation is a bit aggressive and a nuisance when doing heavy
# text edit cycles.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 56f7ecd..0c3627c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -41,13 +41,16 @@ release = ''
# a list of builtin themes.
html_theme = 'openstackdocs'
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-
# -- Options for openstackdocstheme ---------------------------------------
-repository_name = 'openstack-dev/pbr'
+# Deprecated options for openstackdocstheme < 2.2.0, can be removed once
+# pbr stops supporting py27.
+repository_name = 'openstack/pbr'
bug_project = 'pbr'
bug_tag = ''
+
+# New options with openstackdocstheme >=2.2.0
+openstackdocs_repo_name = 'openstack/pbr'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'pbr'
+openstackdocs_bug_tag = ''