diff options
author | pengyuesheng <pengyuesheng@gohighsec.com> | 2019-07-02 14:21:38 +0800 |
---|---|---|
committer | pengyuesheng <pengyuesheng@gohighsec.com> | 2019-08-01 09:43:50 +0800 |
commit | 14f2678c48775acdc57f6b65c96b47f5201e73c0 (patch) | |
tree | 4f7a9adb98fc693bd8f7f28deaa85c9c0be5f890 /doc | |
parent | 8aea1ca7b2de200a61687093b055ac24c1f5cb81 (diff) | |
download | heat-14f2678c48775acdc57f6b65c96b47f5201e73c0.tar.gz |
Bump the openstackdocstheme extension to 1.20
Some options are now automatically configured by the version 1.20:
- project
- html_last_updated_fmt
- latex_engine
- latex_elements
- version
- release.
Change-Id: Ie6b9bdc0cdb6939903920806334f71aa6133c12b
Diffstat (limited to 'doc')
-rw-r--r-- | doc/requirements.txt | 2 | ||||
-rw-r--r-- | doc/source/conf.py | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 94f9fa042..86a11d282 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -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 +openstackdocstheme>=1.20.0 # Apache-2.0 os-api-ref>=1.4.0 # Apache-2.0 sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 053241144..1342c5be7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -26,10 +26,8 @@ import glob import os -import subprocess import sys import tempfile -import warnings from oslo_config import cfg @@ -115,7 +113,6 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Heat' copyright = u'(c) 2012- Heat Developers' # The language for content autogenerated by Sphinx. Refer to documentation @@ -183,7 +180,6 @@ apidoc_excluded_paths = [ # html_theme = '_theme' html_theme = 'openstackdocs' -html_last_updated_fmt = '%Y-%m-%d %H:%M' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. @@ -217,17 +213,6 @@ html_static_path = ['_static'] # robots.txt. html_extra_path = ['_extra'] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' -git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local", - "-n1"] -try: - html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8') -except Exception: - warnings.warn('Cannot get last updated time from git repository. ' - 'Not setting "html_last_updated_fmt".') - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True @@ -271,17 +256,6 @@ htmlhelp_basename = 'Heatdoc' # -- 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]) latex_documents = [ |