diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-22 15:12:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-22 15:12:22 +0000 |
| commit | a5276be3dc519cc814dc18f4c8b80cd0728007a2 (patch) | |
| tree | 11afb39c3e9c79a9e91d6ed45955e2c4e10227ab | |
| parent | 46cdd88358c355d3ba94e21bc3a072ce87b1a5c2 (diff) | |
| parent | 33dc529c378c64864cb22f75f31f620cfd151be0 (diff) | |
| download | oslo-messaging-a5276be3dc519cc814dc18f4c8b80cd0728007a2.tar.gz | |
Merge "Bump the openstackdocstheme extension to 1.20"
| -rw-r--r-- | doc/requirements.txt | 2 | ||||
| -rw-r--r-- | doc/source/conf.py | 8 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 4 |
4 files changed, 2 insertions, 14 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index a31eb38..cb837c3 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 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 reno>=2.5.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 25f9eeb..c68ede8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,15 +6,10 @@ # full list see the documentation: # http://www.sphinx-doc.org/en/master/config -import os -import sys - -sys.path.insert(0, os.path.abspath('../..')) # -- Project information ------------------------------------------------------ # General information about the project. -project = 'oslo.messaging' copyright = '2018, Oslo Contributors' # -- General configuration ---------------------------------------------------- @@ -34,9 +29,6 @@ repository_name = 'openstack/oslo.messaging' bug_project = 'oslo.messaging' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # The master toctree document. master_doc = 'index' diff --git a/lower-constraints.txt b/lower-constraints.txt index 338c12a..ba7af9f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -38,7 +38,7 @@ mox3==0.20.0 msgpack-python==0.4.0 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.18.1 +openstackdocstheme==1.20.0 os-client-config==1.28.0 oslo.concurrency==3.25.0 oslo.config==5.2.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index f248a8a..e8b21ac 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -27,7 +27,6 @@ # -- Project information -------------------------------------------------- # General information about the project. -project = u'oslo.messaging Release Notes' copyright = u'2016, oslo.messaging Developers' # Release notes do not need a version in the title, they span @@ -51,9 +50,6 @@ repository_name = 'openstack/oslo.messaging' bug_project = 'oslo.messaging' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # The master toctree document. master_doc = 'index' |