diff options
| author | Andreas Jaeger <aj@suse.com> | 2020-05-16 09:47:25 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2020-05-18 20:58:01 +0200 |
| commit | 4c0480648d3b08fecbdadc126d9496fa3400f14e (patch) | |
| tree | 47b974f3638bb21ebd856c2af1e972dd7d794f65 | |
| parent | 0e42d495baeb5e97ae2d152e17c73fdb80fb4972 (diff) | |
| download | oslo-rootwrap-4c0480648d3b08fecbdadc126d9496fa3400f14e.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
Update Sphinx version as well.
Remove docs requirements from lower-constraints, they are not needed
during install or test but only for docs building.
openstackdocstheme renames some variables, so follow the renames
before the next release removes them. A couple of variables are also
not needed anymore, remove them.
Depends-On: https://review.opendev.org/728938
Change-Id: Ie162c8e72f4edec345c20de4517304cc14f7fe0d
| -rw-r--r-- | doc/requirements.txt | 6 | ||||
| -rwxr-xr-x | doc/source/conf.py | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 5 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
5 files changed, 11 insertions, 14 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 625782d..625ec03 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,9 +2,9 @@ # 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.20.0 # Apache-2.0 -sphinx>=1.8.0,!=2.1.0 # BSD -reno>=2.5.0 # Apache-2.0 +openstackdocstheme>=2.2.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +reno>=3.1.0 # Apache-2.0 mock>=2.0.0 # BSD fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 171ad87..e32b4b0 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -27,9 +27,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.rootwrap' -bug_project = 'oslo.rootwrap' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.rootwrap' +openstackdocs_bug_project = 'oslo.rootwrap' +openstackdocs_bug_tag = '' # autodoc generation is a bit aggressive and a nuisance when doing heavy # text edit cycles. diff --git a/lower-constraints.txt b/lower-constraints.txt index 0daaef0..8289cd8 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -18,7 +18,6 @@ linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 mox3==0.20.0 -openstackdocstheme==1.20.0 os-client-config==1.28.0 oslotest==3.2.0 pbr==2.0.0 @@ -27,14 +26,12 @@ 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 six==1.10.0 smmap==0.9.0 snowballstemmer==1.2.1 -Sphinx==1.8.0 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.20.0 testtools==2.2.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index de6b5ff..f619b50 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -40,9 +40,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/oslo.rootwrap' -bug_project = 'oslo.rootwrap' -bug_tag = '' +openstackdocs_repo_name = 'openstack/oslo.rootwrap' +openstackdocs_bug_project = 'oslo.rootwrap' +openstackdocs_bug_tag = '' # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff --git a/test-requirements.txt b/test-requirements.txt index 4a129a5..bea15d4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,7 +14,7 @@ oslotest>=3.2.0 # Apache-2.0 # rootwrap daemon's client should be verified to run in eventlet eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT -reno>=2.5.0 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 # Bandit security code scanner bandit>=1.1.0 # Apache-2.0 |