Merge "Switch to newer openstackdocstheme and reno versions"

Author: Zuul

doc/requirements.txt

@@ -2,8 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-openstackdocstheme>=1.30.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 

doc/source/conf.py

@@ -52,15 +52,6 @@
 project = u'cloudkitty-dashboard'
 copyright = u'2014, Objectif Libre'
 
-# 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.
-version = '0.1'
-# The full version, including alpha/beta/rc tags.
-release = '0.1'
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
@@ -91,7 +82,7 @@
 #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 = []
@@ -141,11 +132,6 @@
 # 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 = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
@@ -283,6 +269,7 @@
 #texinfo_no_detailmenu = False
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/cloudkitty-dashboard'
-bug_project = '891'
-bug_tag = 'doc'
+openstackdocs_repo_name = 'openstack/cloudkitty-dashboard'
+openstackdocs_pdf_link = True
+openstackdocs_auto_name = False
+openstackdocs_use_storyboard = True

releasenotes/source/conf.py

@@ -81,7 +81,7 @@
 #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 = []
@@ -130,11 +130,6 @@
 # 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 = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
@@ -257,9 +252,9 @@
 #texinfo_no_detailmenu = False
 
 # -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/cloudkitty-dashboard'
-bug_project = '891'
-bug_tag = 'doc'
+openstackdocs_repo_name = 'openstack/cloudkitty-dashboard'
+openstackdocs_auto_name = False
+openstackdocs_use_storyboard = True
 
 # -- Options for Internationalization output ------------------------------
 locale_dirs = ['locale/']