Switch to newer openstackdocstheme version

Switch to openstackdocstheme 2.2.1 version. Using
this version will allow especially:
* Linking from HTML to PDF document
* Allow parallel building of documents
* Fix some rendering problems

Update Sphinx version as well.

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: Ia09a198905ef04b5ea0c2dac440882c45d8b147c
This commit is contained in:
Andreas Jaeger 2020-06-01 15:21:20 +02:00
parent 5c9c2833eb
commit 8ed0100952
3 changed files with 10 additions and 8 deletions

View File

@ -38,7 +38,12 @@ add_function_parentheses = True
add_module_names = True
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = 'native'
# openstackdocstheme options
openstackdocs_repo_name = 'openstack/pymod2pkg'
openstackdocs_bug_project = 'pymod2pkg'
openstackdocs_bug_tag = ''
# -- Options for HTML output --------------------------------------------------
@ -51,9 +56,6 @@ html_static_path = ['static']
# Output file base name for HTML help builder.
htmlhelp_basename = '%sdoc' % project
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
html_last_updated_fmt = os.popen(git_cmd).read()
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass
# [howto/manual]).

View File

@ -9,7 +9,7 @@ Jinja2==2.10
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.6.1
openstackdocstheme==1.18.1
openstackdocstheme==2.2.1
pbr==2.0.0
pycodestyle==2.3.1
pyflakes==1.6.0
@ -20,7 +20,7 @@ pytz==2013.6
requests==2.14.2
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.6.5
Sphinx==2.0.0
sphinxcontrib-websupport==1.0.1
testrepository==0.0.18
testresources==2.0.0

View File

@ -5,5 +5,5 @@ stestr>=2.0.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
sphinx>=1.6.1,!=1.6.6,!=1.6.7 # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
sphinx>=2.0.0,!=2.1.0 # BSD
openstackdocstheme>=2.2.1 # Apache-2.0