diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-09 13:22:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-09 13:22:15 +0000 |
| commit | 5a9292d1a5c625bc5f97304ce5d16c497e8924f1 (patch) | |
| tree | 02126d3d04a078a722cd8082f4cccf19055d4f6f | |
| parent | ba85b79dd6208cbb3d1e502d3356df3dc6a9262e (diff) | |
| parent | 95a469f9865264dba5d0e19dd29f034960100f62 (diff) | |
| download | python-cinderclient-5a9292d1a5c625bc5f97304ce5d16c497e8924f1.tar.gz | |
Merge "Bump openstackdocstheme to 1.20.0"
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | doc/source/conf.py | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 077e855..9b2838d 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. # These are needed for docs generation -openstackdocstheme>=1.18.1 # Apache-2.0 +openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 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,>=1.6.2;python_version>='3.4' # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 3cfc842..a2b3d40 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -14,7 +14,7 @@ import os import sys -import pbr.version +import openstackdocstheme sys.setrecursionlimit(4000) @@ -48,17 +48,12 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'python-cinderclient' copyright = 'OpenStack Contributors' -# 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. -version_info = pbr.version.VersionInfo('python-cinderclient') -# The short X.Y version. -version = version_info.version_string() -# The full version, including alpha/beta/rc tags. -release = version_info.release_string() +# done by the openstackdocstheme ext +# project = 'python-cinderclient' +# version = version_info.version_string() +# release = version_info.release_string() # List of directories, relative to source directory, that shouldn't be searched # for source files. @@ -84,7 +79,7 @@ html_theme = 'openstackdocs' # 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' -html_last_updated_fmt = '%Y-%m-%d %H:%M' +# html_last_updated_fmt = '%Y-%m-%d %H:%M' # -- Options for manual page output ------------------------------------------ |