openstack/puppet-openstack-cookiecutter
Code Issues Proposed changes

Switch to newer openstackdocstheme and reno versions

Browse Source 
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: I1f6a54548940f149ca9d6c33bea6a0cbb563e0d8
This commit is contained in:
Andreas Jaeger 2020-06-02 14:48:32 +02:00
parent 980b5b9300
commit 46fd332bc4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet-{{cookiecutter.project_name}}/doc/requirements.txt
View File

@ -1,6 +1,6 @@
# This is required for the docs build jobs
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
openstackdocstheme>=1.30.0 # Apache-2.0
sphinx>=2.0.0,!=2.1.0 # BSD
openstackdocstheme>=2.2.1 # Apache-2.0
# This is required for the releasenotes build jobs
reno>=2.5.0 # Apache-2.0
reno>=3.1.0 # Apache-2.0

8
puppet-{{cookiecutter.project_name}}/releasenotes/source/conf.py
View File

@ -86,7 +86,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 = []
@ -248,3 +248,9 @@ texinfo_documents = [
# -- Options for Internationalization output ------------------------------
locale_dirs = ['locale/']
# openstackdocstheme options
openstackdocs_repo_name = 'openstack/puppet-{{cookiecutter.project_name}}'
openstackdocs_bug_project = 'puppet-{{cookiecutter.project_name}}'
openstackdocs_bug_tag = ''