Merge "Switch to newer openstackdocstheme and reno versions"5.0.0

2 files changed, 8 insertions, 6 deletions

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 72f239e..7d57dad 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,7 @@
 # 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.
-sphinx>=1.8.0,!=2.1.0  # BSD
+
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0547331..7579242 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -48,7 +48,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -79,6 +79,7 @@ latex_use_xindy = False
 #intersphinx_mapping = {'http://docs.python.org/': None}
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/python-barbicanclient'
-bug_project = 'python-barbicanclient'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/python-barbicanclient'
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = 'python-barbicanclient'
+openstackdocs_bug_tag = ''