From a492d329e4383cfbc6a5dd00588b0671cc8e7161 Mon Sep 17 00:00:00 2001
From: pengyuesheng <pengyuesheng@gohighsec.com>
Date: Mon, 8 Jul 2019 10:29:28 +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: I33deff1b7c87d223af33cc8f95273e3795a74065
---
 doc/requirements.txt        |  2 +-
 doc/source/conf.py          | 18 ------------------
 releasenotes/source/conf.py | 22 ----------------------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 63659fbc3..9df82cb4a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=1.11.0  # Apache-2.0
+openstackdocstheme>=1.20.0  # Apache-2.0
 reno>=0.1.1  # Apache2
 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 38607b7bf..f4315999e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -13,8 +13,6 @@
 
 import sys
 import os
-import subprocess
-import warnings
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
@@ -77,7 +75,6 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Aodh'
 copyright = u'2012-2015, OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -150,10 +147,6 @@ html_theme = 'openstackdocs'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# 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'
-
 # openstackdocstheme options
 repository_name = 'openstack/aodh'
 bug_project = 'aodh'
@@ -202,17 +195,6 @@ htmlhelp_basename = 'Aodhdoc'
 
 # -- 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': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 9fa2d291c..6e923dc08 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -55,15 +55,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Aodh Release Notes'
 copyright = u'2015, Aodh Developers'
 
-# Release notes are independent.
-# The full version, including alpha/beta/rc tags.
-release = ''
-# The short X.Y version.
-version = ''
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None
@@ -143,10 +136,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# 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'
-
 # openstackdocstheme options
 repository_name = 'openstack/aodh'
 bug_project = 'aodh'
@@ -195,17 +184,6 @@ htmlhelp_basename = 'AodhReleaseNotesdoc'
 
 # -- 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': '',
-}
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).