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: If0c72f4b5df2ac8983401a91e468d4e3863b2ba5
This commit is contained in:
Andreas Jaeger 2020-06-02 14:05:29 +02:00
parent e2d1364353
commit 27feeadf4b
3 changed files with 13 additions and 13 deletions

View File

@ -41,8 +41,9 @@ project = u'openstack'
copyright = u'2017, OpenStack Developers'
# openstackdocstheme options
repository_name = 'openstack/vitrage-tempest-plugin'
use_storyboard = True
openstackdocs_repo_name = 'openstack/vitrage-tempest-plugin'
openstackdocs_auto_name = False
openstackdocs_use_storyboard = True
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
@ -52,7 +53,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 --------------------------------------------------

View File

@ -56,9 +56,10 @@ project = u'virtage_tempest_plugin Release Notes'
copyright = u'2017, OpenStack Developers'
# openstackdocstheme options
repository_name = 'openstack/openstack'
bug_project = 'virtage_tempest_plugin'
bug_tag = ''
openstackdocs_repo_name = 'openstack/openstack'
openstackdocs_auto_name = False
openstackdocs_bug_project = 'virtage_tempest_plugin'
openstackdocs_bug_tag = ''
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@ -100,7 +101,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 = []

View File

@ -2,10 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=3.0.1,<3.1.0;python_version>='3.5' # Apache-2.0
hacking>=1.1.0,<1.2.0;python_version=='2.7' # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx>=2.0.0,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.31.2 # Apache-2.0
hacking>=3.0.1,<3.1.0 # Apache-2.0
sphinx>=2.0.0,!=2.1.0 # BSD
openstackdocstheme>=2.2.1 # Apache-2.0
# releasenotes
reno>=2.5.0 # Apache-2.0
reno>=3.1.0 # Apache-2.0