Merge "Switch to newer openstackdocstheme and reno versions"

This commit is contained in:
Zuul 2020-07-06 18:52:41 +00:00 committed by Gerrit Code Review
commit dba1d390da
3 changed files with 13 additions and 14 deletions

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
openstackdocstheme>=1.18.1 # Apache-2.0 openstackdocstheme>=2.2.1 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD sphinx>=2.0.0,!=2.1.0 # BSD
reno>=2.5.0 # Apache-2.0 reno>=3.1.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD

View File

@ -28,11 +28,10 @@ project = u'diskimage-builder'
copyright = u'2015-2016, Various Authors' copyright = u'2015-2016, Various Authors'
# openstackdocstheme options # openstackdocstheme options
repository_name = 'openstack/diskimage-builder' openstackdocs_repo_name = 'openstack/diskimage-builder'
bug_project = 'diskimage-builder' openstackdocs_bug_project = 'diskimage-builder'
bug_tag = '' openstackdocs_auto_name = False
html_last_updated_fmt = '%Y-%m-%d %H:%M' openstackdocs_bug_tag = ''
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
@ -65,7 +64,7 @@ exclude_patterns = ['_build', 'doc/build', '.tox', '.venv',
#show_authors = False #show_authors = False
# The name of the Pygments (syntax highlighting) style to use. # 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. # A list of ignored prefixes for module index sorting.
#modindex_common_prefix = [] #modindex_common_prefix = []

View File

@ -20,10 +20,10 @@ project = u'diskimage-builder'
copyright = u'2016, Diskimage-builder contributors' copyright = u'2016, Diskimage-builder contributors'
# openstackdocstheme options # openstackdocstheme options
repository_name = 'openstack/diskimage-builder' openstackdocs_repo_name = 'openstack/diskimage-builder'
bug_project = 'diskimage-builder' openstackdocs_bug_project = 'diskimage-builder'
bug_tag = '' openstackdocs_auto_name = False
html_last_updated_fmt = '%Y-%m-%d %H:%M' openstackdocs_bug_tag = ''
# Release notes do not need a version in the title, they span # Release notes do not need a version in the title, they span
# multiple versions. # multiple versions.
@ -62,7 +62,7 @@ exclude_patterns = []
#show_authors = False #show_authors = False
# The name of the Pygments (syntax highlighting) style to use. # 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. # A list of ignored prefixes for module index sorting.
#modindex_common_prefix = [] #modindex_common_prefix = []