From 954693f5ff1ca7245457dec17e6f116f4443c9d2 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Wed, 9 Dec 2020 08:08:11 +0000 Subject: [PATCH] Use a separate doc requirements file As per the OpenStack TC decision [1], the doc requirements should be listed separately. This also simplifies the requirements handling. At them moment, we're facing some issues due to conflicting doc related lower constraints. While at it, we're bumping the lower constraints based on Nova's requirements, dropping indirect dependencies which are very difficult to maintain. [1] https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Ifffbb94c069d58df1dbaa1c5a1681312e8455ae2 --- doc/requirements.txt | 11 +++++++++ lower-constraints.txt | 54 ++++++++----------------------------------- requirements.txt | 6 ++--- test-requirements.txt | 10 ++------ tox.ini | 1 + 5 files changed, 26 insertions(+), 56 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 00000000..5821c3bf --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,11 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 + +# releasenotes +reno>=3.1.0 # Apache-2.0 + +oslo.config>=6.8.0 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 38ae4691..59da5f43 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,59 +1,23 @@ -alabaster==0.7.10 -appdirs==1.3.0 coverage==4.0 -ddt==1.0.1 -debtcollector==1.2.0 -docutils==0.11 -dulwich==0.15.0 +ddt==1.2.1 +debtcollector==1.19.0 eventlet==0.22.0 -extras==1.0.0 -fasteners==0.7.0 -fixtures==3.0.0 -greenlet==0.4.15 -imagesize==0.7.1 -iso8601==0.1.11 -Jinja2==2.10 -keystoneauth1==3.4.0 -linecache2==1.0.0 -MarkupSafe==1.1.1 -mccabe==0.2.1 -mox3==0.20.0 -msgpack-python==0.4.0 netaddr==0.7.18 -netifaces==0.10.4 openstackdocstheme==2.2.1 -os-client-config==1.28.0 -oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 +oslo.concurrency==3.29.0 +oslo.config==6.8.0 +oslo.context==2.22.2 oslo.i18n==3.15.3 oslo.log==3.36.0 -oslo.serialization==2.18.0 -oslo.utils==3.33.0 -oslotest==3.2.0 +oslo.serialization==2.21.1 +oslo.utils==4.7.0 +oslotest==3.8.0 pbr==2.0.0 -Pygments==2.2.0 -pyinotify==0.9.6 PyMI==1.0.0;sys_platform=='win32' -pyparsing==2.1.0 -python-dateutil==2.5.3 -python-mimeparse==1.6.0 -python-subunit==1.0.0 -pytz==2013.6 -PyYAML==3.13 -reno==3.1.0 -requests==2.14.2 -requestsexceptions==1.2.0 -rfc3986==0.3.1 -six==1.10.0 -snowballstemmer==1.2.1 -Sphinx==2.0.0 -sphinxcontrib-websupport==1.0.1 +six==1.12.0 stestr===2.0.0 stevedore==1.20.0 testscenarios==0.4 testtools==2.2.0 -traceback2==1.4.0 -unittest2==1.1.0 wmi==0.5;sys_platform=='win32' wrapt==1.7.0 diff --git a/requirements.txt b/requirements.txt index 18a5284b..c28a94da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,10 +5,10 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 eventlet>=0.22.0 # MIT -oslo.concurrency>=3.26.0 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 +oslo.concurrency>=3.29.0 # Apache-2.0 +oslo.config>=6.8.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 -oslo.utils>=3.33.0 # Apache-2.0 +oslo.utils>=4.7.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 # Windows-only requirements diff --git a/test-requirements.txt b/test-requirements.txt index dc8f2513..67ad72c5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,14 +5,8 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -ddt>=1.0.1 # MIT -docutils>=0.11 # OSI-Approved Open Source, Public Domain -sphinx>=2.0.0,!=2.1.0 # BSD -oslo.config>=5.2.0 # Apache-2.0 -oslotest>=3.2.0 # Apache-2.0 +ddt>=1.2.1 # MIT +oslotest>=3.8.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -openstackdocstheme>=2.2.1 # Apache-2.0 -# releasenotes -reno>=3.1.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 71fd54cb..ca322763 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ commands = {posargs} commands = python setup.py test --coverage --testr-args='{posargs}' [testenv:docs] +deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes]