Merge "Switch to newer openstackdocstheme and reno versions"

changes/45/739645/1
Zuul 2 years ago committed by Gerrit Code Review
commit dba1d390da
  1. 6
      doc/requirements.txt
  2. 11
      doc/source/conf.py
  3. 10
      releasenotes/source/conf.py

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

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

@ -20,10 +20,10 @@ project = u'diskimage-builder'
copyright = u'2016, Diskimage-builder contributors'
# openstackdocstheme options
repository_name = 'openstack/diskimage-builder'
bug_project = 'diskimage-builder'
bug_tag = ''
html_last_updated_fmt = '%Y-%m-%d %H:%M'
openstackdocs_repo_name = 'openstack/diskimage-builder'
openstackdocs_bug_project = 'diskimage-builder'
openstackdocs_auto_name = False
openstackdocs_bug_tag = ''
# Release notes do not need a version in the title, they span
# multiple versions.
@ -62,7 +62,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 = []

Loading…
Cancel
Save