Merge "Switch to newer openstackdocstheme and reno versions"

doc/requirements.txt

@@ -1,7 +1,7 @@
-openstackdocstheme>=1.20.0  # Apache-2.0
-reno>=2.5.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2  # BSD
+sphinx>=2.0.0,!=2.1.0 # BSD
 os-api-ref>=1.4.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
 sphinxcontrib-svg2pdfconverter  # BSD

doc/source/conf.py

@@ -84,9 +84,10 @@ exclude_trees = []
 copyright = u"2017, Cinder Developers"
 
 # openstackdocstheme options
-repository_name = 'openstack/cinderlib'
-bug_project = 'cinderlib'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/cinderlib'
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = 'cinderlib'
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -118,7 +119,7 @@ add_module_names = False
 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 = ['cinderlib.']

lower-constraints.txt

@@ -1,12 +1,8 @@
 cinder==13.0.0
 mock==2.0.0
-openstackdocstheme==1.20.0
 os-brick==2.7.0
 pbr==2.0.0
-reno==2.5.0
 six==1.10.0
-Sphinx==1.6.2
-sphixcontrib-websupport==1.0.1
 stestr==1.0.0
 stevedore==1.20.0
 urllib3==1.21.1

releasenotes/source/conf.py

@@ -48,6 +48,6 @@ html_theme = 'openstackdocs'
 
 # -- Options for openstackdocstheme -------------------------------------------
 
-repository_name = 'openstack/cinderlib'
-bug_project = 'cinderlib'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/cinderlib'
+openstackdocs_bug_project = 'cinderlib'
+openstackdocs_bug_tag = ''