Merge "Fix openstackdocstheme"

This commit is contained in:
Jenkins 2017-07-04 13:13:44 +00:00 committed by Gerrit Code Review
commit 6e79149c34
2 changed files with 10 additions and 5 deletions

View File

@ -20,7 +20,6 @@
# -- General configuration ------------------------------------------------ # -- General configuration ------------------------------------------------
import openstackdocstheme
# If your documentation needs a minimal Sphinx version, state it here. # If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0' #needs_sphinx = '1.0'
@ -29,6 +28,7 @@ import openstackdocstheme
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones. # ones.
extensions = [ extensions = [
'openstackdocstheme',
'reno.sphinxext', 'reno.sphinxext',
] ]
@ -108,7 +108,7 @@ html_theme = 'openstackdocs'
#html_theme_options = {} #html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory. # Add any paths that contain custom themes here, relative to this directory.
html_theme_path = [openstackdocstheme.get_html_theme_path()] # html_theme_path = []
# The name for this set of Sphinx documents. If None, it defaults to # The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation". # "<project> v<release> documentation".
@ -138,7 +138,7 @@ html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format. # using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y' html_last_updated_fmt = '%Y-%m-%d %H:%M'
# If true, SmartyPants will be used to convert quotes and dashes to # If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities. # typographically correct entities.
@ -261,3 +261,8 @@ texinfo_documents = [
# -- Options for Internationalization output ------------------------------ # -- Options for Internationalization output ------------------------------
locale_dirs = ['locale/'] locale_dirs = ['locale/']
# openstackdocstheme options
repository_name = 'openstack/puppet-glance'
bug_project = 'puppet-glance'
bug_tag = ''

View File

@ -1,6 +1,6 @@
# This is required for the docs build jobs # This is required for the docs build jobs
sphinx!=1.6.1,>=1.5.1 # BSD sphinx>=1.6.2 # BSD
openstackdocstheme>=1.5.0 # Apache-2.0 openstackdocstheme>=1.11.0 # Apache-2.0
# This is required for the releasenotes build jobs # This is required for the releasenotes build jobs
# FIXME: reno is manually pinned to !=2.0.0 because of bug #1651995 # FIXME: reno is manually pinned to !=2.0.0 because of bug #1651995