From 8e219cd51df25a06228e3485d05ca8f49dd10381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=9F=E5=B0=8F=E5=90=9B?= Date: Thu, 6 Jun 2019 10:10:34 +0800 Subject: [PATCH] Bump openstackdocstheme to 1.20.0 Some options are now automatically configured by the version 1.20: - project - html_last_updated_fmt - latex_engine - latex_elements - version - release. Change-Id: I38d3f05ce9d6a32a0c4e5d44df13e527aa629b2e --- doc/source/conf.py | 21 +++------------------ lower-constraints.txt | 2 +- test-requirements.txt | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0bedef233..1ab3cf443 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -26,20 +26,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Ironic Python Agent' copyright = u'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 short X.Y version. -from ironic_python_agent import version as ipa_version -# The full version, including alpha/beta/rc tags. -release = ipa_version.version_info.release_string() -# The short X.Y version. -version = ipa_version.version_info.version_string() - # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['ironic_python_agent'] @@ -70,11 +58,8 @@ repository_name = 'openstack/ironic-python-agent' bug_project = 'ironic-python-agent' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project +htmlhelp_basename = 'Ironic Python Agentdoc' # Grouping the document tree into LaTeX files. List of tuples @@ -83,8 +68,8 @@ htmlhelp_basename = '%sdoc' % project latex_documents = [ ( 'index', - '%s.tex' % project, - u'%s Documentation' % project, + 'Ironic Python Agent.tex', + u'Ironic Python Agent Documentation', u'OpenStack Foundation', 'manual' ), diff --git a/lower-constraints.txt b/lower-constraints.txt index 82b98089e..9aae8f2a5 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -40,7 +40,7 @@ mox3==0.25.0 msgpack==0.5.6 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.18.1 +openstackdocstheme==1.20.0 os-client-config==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 25c8aaaba..afc80a2b7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,5 +16,5 @@ doc8>=0.6.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 sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0 -openstackdocstheme>=1.18.1 # Apache-2.0 +openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0