From 1becd6dda9f61652d1ff1345898514bf0e73c0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=9F=E5=B0=8F=E5=90=9B?= <zhaixiaojun@gohighsec.com>
Date: Thu, 6 Jun 2019 10:03:56 +0800
Subject: [PATCH] Bump openstackdocstheme to 1.20.0

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

Change-Id: I308c3296bc56fdb623a9fc6b021c388be2d33330
---
 doc/requirements.txt  |  2 +-
 doc/source/conf.py    | 19 +++----------------
 lower-constraints.txt |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index a51019ae40..6a5e0dfdb1 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,5 @@
 mock>=3.0.0 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.20.0 # Apache-2.0
 os-api-ref>=1.4.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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8835609c0f..20b2b0ab52 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -56,7 +56,6 @@ apidoc_separate_modules = True
 repository_name = 'openstack/ironic'
 bug_project = '943'
 bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 wsme_protocols = ['restjson']
 
@@ -74,7 +73,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Ironic'
 copyright = u'OpenStack Foundation'
 
 config_generator_config_file = '../../tools/config/ironic-config-generator.conf'
@@ -83,17 +81,6 @@ sample_config_basename = '_static/ironic'
 policy_generator_config_file = '../../tools/policy/ironic-policy-generator.conf'
 sample_policy_basename = '_static/ironic'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-from ironic import version as ironic_version
-# The full version, including alpha/beta/rc tags.
-release = ironic_version.version_info.release_string()
-# The short X.Y version.
-version = ironic_version.version_info.version_string()
-
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['ironic.']
 
@@ -128,7 +115,7 @@ else:
     html_theme = 'default'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
+htmlhelp_basename = 'Ironicdoc'
 
 
 # Grouping the document tree into LaTeX files. List of tuples
@@ -137,8 +124,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     (
         'index',
-        '%s.tex' % project,
-        u'%s Documentation' % project,
+        'Ironic.tex',
+        u'Ironic Documentation',
         u'OpenStack Foundation',
         'manual'
     ),
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 82d9999bfd..4c23a11f6a 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -61,7 +61,7 @@ msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
-openstackdocstheme==1.18.1
+openstackdocstheme==1.20.0
 openstacksdk==0.25.0
 os-api-ref==1.4.0
 os-client-config==1.29.0