diff options
| author | Andreas Jaeger <aj@suse.com> | 2020-05-14 21:42:51 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2020-05-18 21:08:01 +0200 |
| commit | bfe712511ee66bfb8736c2da41eda848de540b43 (patch) | |
| tree | 694bce0631aba3b21b22a699a769570f96d2c92c | |
| parent | 8924c4e1ab462566f915422dae5cf87ebbb4e8a5 (diff) | |
| download | oslo-concurrency-bfe712511ee66bfb8736c2da41eda848de540b43.tar.gz | |
Switch to newer openstackdocstheme and reno versions
Switch to openstackdocstheme 2.2.0 and reno 3.1.0 versions. Using
these versions will allow especially:
* Linking from HTML to PDF document
* Allow parallel building of documents
* Fix some rendering problems
Update Sphinx version as well.
openstackdocstheme renames some variables, so follow the renames. A
couple of variables are also not needed anymore, remove them.
Depends-On: https://review.opendev.org/728938
Change-Id: Ifd0f8e57c0052e5102aa914c8326159a72dad43c
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rwxr-xr-x | doc/source/conf.py | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 6 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index ba34ac7..400e1d9 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,8 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # this is required for the docs build jobs -sphinx>=1.8.0,!=2.1.0 # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index e3516e0..2620b8d 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -24,9 +24,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.concurrency' -bug_project = 'oslo.concurrency' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.concurrency' +openstackdocs_bug_project = 'oslo.concurrency' +openstackdocs_bug_tag = '' # The master toctree document. master_doc = 'index' diff --git a/lower-constraints.txt b/lower-constraints.txt index 986794b..553ee96 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -28,7 +28,7 @@ monotonic==0.6 mox3==0.20.0 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.20.0 +openstackdocstheme==2.2.0 os-client-config==1.28.0 oslo.config==5.2.0 oslo.i18n==3.15.3 @@ -43,14 +43,14 @@ python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 -reno==2.5.0 +reno==3.1.0 requests==2.14.2 requestsexceptions==1.2.0 rfc3986==0.3.1 six==1.10.0 smmap==0.9.0 snowballstemmer==1.2.1 -Sphinx==1.8.0 +Sphinx==2.0.0 sphinxcontrib-websupport==1.0.1 stevedore==1.20.0 stestr==2.0.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 2351d2f..8045747 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -40,9 +40,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.config' -bug_project = 'oslo.config' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.config' +openstackdocs_bug_project = 'oslo.config' +openstackdocs_bug_tag = '' # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] |