From a13f8915c119f9e5d6cfdfdb90bccf225579da20 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 21 May 2020 20:51:20 +0200
Subject: [PATCH] Update sphinx config

Use native pygments style as that was the previous value of
openstackdocstheme, remove now unneeded settings.

Increase openstackdocstheme version.

Change-Id: I51aa725a8058705fecf041b4dad007a740d92b87
---
 doc/requirements.txt |  2 +-
 doc/source/conf.py   | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index c22e0dfb..cffdd7bb 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=2.1.1 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 52f6c00a..aaf0493b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -22,8 +22,6 @@
 
 import os
 
-import openstackdocstheme
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -86,7 +84,7 @@ exclude_patterns = ['common/appendix.rst']
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -135,12 +133,6 @@ html_theme = 'openstackdocs'
 # 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.
-# So that we can enable "log-a-bug" links from each output HTML page, this
-# variable must be set to a format that includes year, month, day, hours and
-# minutes.
-# html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -186,13 +178,6 @@ htmlhelp_basename = 'ops-guide'
 html_copy_source = False
 
 # -- Options for LaTeX output ---------------------------------------------
-pdf_theme_path = openstackdocstheme.get_pdf_theme_path()
-openstack_logo = openstackdocstheme.get_openstack_logo_path()
-
-latex_custom_template = r"""
-\newcommand{\openstacklogo}{%s}
-\usepackage{%s}
-""" % (openstack_logo, pdf_theme_path)
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,