From 6abcfe6977de19b78dd04d188d989cbbab7cadac Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 4 Jun 2020 14:39:38 +0200 Subject: [PATCH] Switch to newer openstackdocstheme and reno versions Switch to openstackdocstheme 2.2.1 and reno 3.1.0 versions. Using these versions will allow especially: * Linking from HTML to PDF document * Allow parallel building of documents * Fix some rendering problems Update Sphinx version as well. Disable openstackdocs_auto_name to use 'project' variable as name. Change pygments_style to 'native' since old theme version always used 'native' and the theme now respects the setting and using 'sphinx' can lead to some strange rendering. openstackdocstheme renames some variables, so follow the renames before the next release removes them. A couple of variables are also not needed anymore, remove them. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: Idcf44f0980a298bd4d63e10c178b72372a449839 --- api-ref/source/conf.py | 10 ++++++---- doc/requirements.txt | 6 +++--- doc/source/conf.py | 14 +++++--------- releasenotes/source/conf.py | 12 +++++------- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 02577ee8..3dddd686 100644 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -41,10 +41,12 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -repository_name = 'openstack/stx-update' project = u'StarlingX Update' -bug_project = 'starlingx' -bug_tag = 'stx.update' + +# openstackdocstheme options +openstackdocs_repo_name = 'starlingx/update' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # If true, the current module name will be prepended to all description # unit titles (such as .. function::). @@ -55,7 +57,7 @@ add_module_names = False show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass diff --git a/doc/requirements.txt b/doc/requirements.txt index d197d454..5f5e4377 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,8 +1,8 @@ -sphinx>=1.6.2 -openstackdocstheme>=1.26.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 # Release Notes documentation -reno>=0.1.1 # Apache2 +reno>=3.1.0 # Apache-2.0 # Api Ref documentation os-api-ref>=1.4.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index eeb05928..e3d08dca 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -27,12 +27,6 @@ project = u'StarlingX Update' copyright = u'2018, StarlingX' author = u'StarlingX' -# The short X.Y version -version = u'' -# The full version, including alpha/beta/rc tags -release = u'0.1' - - # -- General configuration --------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. @@ -58,8 +52,10 @@ source_suffix = '.rst' # The master toctree document. master_doc = 'index' -bug_project = '1027' -bug_tag = 'stx.bug' +# openstackdocstheme options +openstackdocs_repo_name = 'starlingx/update' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -74,7 +70,7 @@ language = None exclude_patterns = [] # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # -- Options for HTML output ------------------------------------------------- diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 7e5a499b..667ed1a0 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -31,8 +31,10 @@ extensions = [ 'reno.sphinxext', ] -bug_project = '1027' -bug_tag = 'stx.bug' +# openstackdocstheme options +openstackdocs_repo_name = 'starlingx/update' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # Add any paths that contain templates here, relative to this directory. # templates_path = ['_templates'] @@ -82,7 +84,7 @@ exclude_patterns = [] # 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 = [] @@ -131,10 +133,6 @@ html_theme = 'starlingxdocs' # 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' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True