Merge "Bump the openstackdocstheme extension to 1.20"
This commit is contained in:
commit
a632534766
|
@ -27,8 +27,6 @@
|
|||
import os
|
||||
import sys
|
||||
|
||||
from murano.version import version_info
|
||||
|
||||
extensions = [
|
||||
'os_api_ref',
|
||||
'openstackdocstheme'
|
||||
|
@ -44,7 +42,6 @@ html_theme_options = {
|
|||
repository_name = 'openstack/murano'
|
||||
bug_project = 'murano'
|
||||
bug_tag = 'api-ref'
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
# If extensions (or modules to document with autodoc) are in another directory,
|
||||
# add these directories to sys.path here. If the directory is relative to the
|
||||
|
@ -69,18 +66,8 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'Application Catalog API Reference'
|
||||
copyright = u'2016-present, OpenStack Foundation'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
#
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = version_info.release_string()
|
||||
# The short X.Y version.
|
||||
version = version_info.version_string()
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
#
|
||||
|
|
|
@ -3,5 +3,5 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
|||
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
|
||||
sphinxcontrib-httpdomain>=1.3.0 # BSD
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||
os-api-ref>=1.4.0 # Apache-2.0
|
||||
|
|
|
@ -13,9 +13,7 @@
|
|||
# under the License.
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import warnings
|
||||
|
||||
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
|
||||
|
||||
|
@ -56,14 +54,10 @@ source_suffix = '.rst'
|
|||
# The master toctree document.
|
||||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = 'Murano'
|
||||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/murano'
|
||||
bug_project = 'murano'
|
||||
bug_tag = ''
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
config_generator_config_file = '../../etc/oslo-config-generator/murano.conf'
|
||||
sample_config_basename = '_static/murano'
|
||||
|
@ -73,13 +67,6 @@ policy_generator_config_file = [
|
|||
'_static/murano'),
|
||||
]
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
from murano.version import version_info
|
||||
release = version_info.release_string()
|
||||
version = version_info.version_string()
|
||||
|
||||
# Set the default Pygments syntax
|
||||
highlight_language = 'python'
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ murano-pkg-check==0.3.0
|
|||
netaddr==0.7.18
|
||||
netifaces==0.10.6
|
||||
nose==1.3.7
|
||||
openstackdocstheme==1.18.1
|
||||
openstackdocstheme==1.20.0
|
||||
openstacksdk==0.12.0
|
||||
os-api-ref==1.4.0
|
||||
os-client-config==1.29.0
|
||||
|
|
|
@ -55,23 +55,16 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'Murano Release Notes'
|
||||
copyright = u'2015, Murano Developers'
|
||||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/murano'
|
||||
bug_project = 'murano'
|
||||
bug_tag = ''
|
||||
html_last_updated_fmt = '%Y-%m-%d %H:%M'
|
||||
|
||||
# Release notes are version independent.
|
||||
# The short X.Y version.
|
||||
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = ''
|
||||
# The short X.Y version.
|
||||
version = ''
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
# language = None
|
||||
|
@ -198,17 +191,6 @@ htmlhelp_basename = 'MuranoReleaseNotesdoc'
|
|||
|
||||
# -- Options for LaTeX output ---------------------------------------------
|
||||
|
||||
latex_elements = {
|
||||
# The paper size ('letterpaper' or 'a4paper').
|
||||
# 'papersize': 'letterpaper',
|
||||
|
||||
# The font size ('10pt', '11pt' or '12pt').
|
||||
# 'pointsize': '10pt',
|
||||
|
||||
# Additional stuff for the LaTeX preamble.
|
||||
# 'preamble': '',
|
||||
}
|
||||
|
||||
# Grouping the document tree into LaTeX files. List of tuples
|
||||
# (source start file, target name, title,
|
||||
# author, documentclass [howto, manual, or own class]).
|
||||
|
|
Loading…
Reference in New Issue