From adb807609485083dc34c89da1710079f6a3998a5 Mon Sep 17 00:00:00 2001
From: pengyuesheng <pengyuesheng@gohighsec.com>
Date: Fri, 26 Jul 2019 14:50:08 +0800
Subject: [PATCH] Bump the openstackdocstheme extension to 1.20

Some options are now automatically configured by the version 1.20:
- project
- html_last_updated_fmt
- latex_engine
- latex_elements
- version
- release.

Change-Id: I95aa4478756873eec5f7480ba3ac0e5e4eea0a43
---
 doc/requirements.txt        |  2 +-
 doc/source/conf.py          |  8 +++-----
 lower-constraints.txt       |  2 +-
 releasenotes/source/conf.py | 20 --------------------
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 5ab3ef4c..2b11cb53 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,4 @@
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8d70342b..4c0cacad 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,14 +37,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'kuryr'
 copyright = u'2013, OpenStack Foundation'
 
 # openstackdocstheme options
 repository_name = 'openstack/kuryr'
 bug_project = 'kuryr'
 bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -65,15 +63,15 @@ html_theme = 'openstackdocs'
 # html_static_path = ['static']
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
+htmlhelp_basename = 'kuryrdoc'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
     ('index',
-     '%s.tex' % project,
-     u'%s Documentation' % project,
+     'kuryr.tex',
+     u'kuryr Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index d62e5722..e278eab4 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -45,7 +45,7 @@ munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
 neutron-lib==1.13.0
-openstackdocstheme==1.18.1
+openstackdocstheme==1.20.0
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index cddece8a..1ea21329 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -51,14 +51,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'kuryr'
 copyright = u'2016, Kuryr developers'
 
 # openstackdocstheme options
 repository_name = 'openstack/kuryr'
 bug_project = 'kuryr'
 bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Release notes do not need a version number in the title, they
 # cover multiple releases.
@@ -243,24 +241,6 @@ htmlhelp_basename = 'kuryrdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
-
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
-
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
-
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).