From a24c7744ad7149f8f29c6be1111f16d42623c50e Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 5 Feb 2019 19:58:51 +0100 Subject: [PATCH] Reduce the dependencies, add more common Zuul jobs The requirements files have been mostly copied from sahara.git, but most of the dependencies are not needed. Refresh the content of lower-constraints.txt and ensure that the lower-constraints tox environment considers also the doc dependencies. Explicitly depend on the pre-release of Sahara for Stein. Add few more jobs to avoid breakages, namely: - add check-requirements and openstack-lower-constraints-jobs; - replace tempest-plugin-jobs with openstack-python-jobs, openstack-python35-jobs and openstack-python36-jobs now that it is possible to depend on sahara. Change-Id: I370490435d40a4a53e70d32a7a08e551a2c1ad54 --- .zuul.yaml | 6 +- lower-constraints.txt | 222 +++++++++++++++++++++--------------------- requirements.txt | 34 +------ test-requirements.txt | 4 - tox.ini | 2 +- 5 files changed, 118 insertions(+), 150 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d60cec6..569b58e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,9 @@ - project: templates: - - tempest-plugin-jobs + - check-requirements + - openstack-lower-constraints-jobs + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/lower-constraints.txt b/lower-constraints.txt index efaf3f8..1d2ebcc 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,33 +1,32 @@ -alabaster==0.7.10 -alembic==0.8.10 -amqp==2.2.2 +alabaster==0.7.12 +alembic==1.0.7 +amqp==2.4.1 appdirs==1.4.3 asn1crypto==0.24.0 astroid==1.3.8 +attrs==18.2.0 Babel==2.3.4 -bandit==1.1.0 +bandit==1.5.1 bashate==0.5.1 -bcrypt==3.1.4 -botocore==1.5.1 -cachetools==2.0.1 -castellan==0.16.0 -certifi==2018.1.18 +bcrypt==3.1.6 +botocore==1.12.87 +cachetools==3.1.0 +castellan==1.1.0 +certifi==2018.11.29 cffi==1.11.5 chardet==3.0.4 -click==6.7 -cliff==2.11.0 -cmd2==0.8.1 -contextlib2==0.5.5 +Click==7.0 +cliff==2.14.0 +cmd2==0.9.7 +colorama==0.4.1 coverage==4.0 -cryptography==2.1.4 -debtcollector==1.19.0 -decorator==4.2.1 -deprecation==2.0 +cryptography==2.5 +debtcollector==1.20.0 +decorator==4.3.2 doc8==0.6.0 docutils==0.14 -dogpile.cache==0.6.5 -dulwich==0.19.0 -enum-compat==0.0.2 +dogpile.cache==0.6.8 +dulwich==0.19.10 eventlet==0.18.2 extras==1.0.0 fasteners==0.14.1 @@ -35,128 +34,129 @@ fixtures==3.0.0 flake8==2.6.2 Flask==1.0.2 future==0.16.0 -futurist==1.6.0 -gitdb2==2.0.3 -GitPython==2.1.8 -greenlet==0.4.13 +futurist==1.8.0 +gitdb2==2.0.5 +GitPython==2.1.11 +greenlet==0.4.15 +grpcio==1.15.0 hacking==1.1.0 -idna==2.6 -imagesize==1.0.0 -iso8601==0.1.11 -itsdangerous==0.24 +imagesize==1.1.0 +iso8601==0.1.12 +itsdangerous==1.1.0 Jinja2==2.10 jmespath==0.9.3 -jsonpatch==1.21 +jsonpatch==1.23 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.4.0 -keystonemiddleware==4.17.0 -kombu==4.1.0 +keystoneauth1==3.11.2 +keystonemiddleware==5.3.0 +kombu==4.2.2.post1 linecache2==1.0.0 -logilab-common==1.4.1 +logilab-common==1.4.2 Mako==1.0.7 -MarkupSafe==1.0 -mccabe==0.2.1 +MarkupSafe==1.1.0 +mccabe==0.5.3 +microversion-parse==0.2.1 mock==2.0.0 -monotonic==1.4 -mox3==0.25.0 -msgpack==0.5.6 -munch==2.2.0 +monotonic==1.5 +mox3==0.26.0 +msgpack==0.6.1 +msgpack-python==0.5.6 +munch==2.3.2 netaddr==0.7.19 -netifaces==0.10.6 -openstackdocstheme==1.18.1 -openstacksdk==0.12.0 -os-api-ref==1.4.0 -os-client-config==1.29.0 -os-service-types==1.2.0 -osc-lib==1.10.0 -oslo.cache==1.29.0 -oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.db==4.27.0 +netifaces==0.10.9 +openstackdocstheme==1.29.0 +openstacksdk==0.24.0 +os-api-ref==1.6.0 +os-client-config==1.31.2 +os-service-types==1.5.0 +osc-lib==1.12.0 +oslo.cache==1.32.0 +oslo.concurrency==3.29.0 +oslo.config==6.8.0 +oslo.context==2.22.0 +oslo.db==4.43.0 oslo.i18n==3.15.3 oslo.log==3.36.0 -oslo.messaging==5.29.0 -oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.rootwrap==5.8.0 +oslo.messaging==9.4.0 +oslo.middleware==3.37.0 +oslo.policy==2.1.0 +oslo.rootwrap==5.15.1 oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.upgradecheck==0.1.0 +oslo.service==1.36.0 +oslo.upgradecheck==0.1.1 oslo.utils==3.33.0 oslotest==3.2.0 -packaging==17.1 -paramiko==2.0.0 -Paste==2.0.3 -PasteDeploy==1.5.2 +packaging==19.0 +paramiko==2.4.2 +Paste==3.0.6 +PasteDeploy==2.0.1 pbr==2.0.0 -pika-pool==0.1.3 -pika==0.10.0 prettytable==0.7.2 -psycopg2==2.6.2 -pyasn1==0.4.2 -pycadf==2.7.0 -pycparser==2.18 -pycodestyle==2.4.0 -pyflakes==0.8.1 -Pygments==2.2.0 +pyasn1==0.4.5 +pycadf==2.9.0 +pycodestyle==2.0.0 +pycparser==2.19 +pyflakes==1.2.3 +Pygments==2.3.1 pyinotify==0.9.6 pylint==1.4.5 -PyMySQL==0.7.6 -PyNaCl==1.2.1 -pyOpenSSL==17.5.0 -pyparsing==2.2.0 -pyperclip==1.6.0 -python-barbicanclient==4.6.0 -python-cinderclient==3.3.0 -python-dateutil==2.7.0 -python-editor==1.0.3 -python-glanceclient==2.8.0 -python-heatclient==1.10.0 -python-keystoneclient==3.8.0 -python-manilaclient==1.16.0 +PyNaCl==1.3.0 +pyOpenSSL==19.0.0 +pyparsing==2.3.1 +pyperclip==1.7.0 +python-barbicanclient==4.8.1 +python-cinderclient==4.1.0 +python-dateutil==2.8.0 +python-editor==1.0.4 +python-glanceclient==2.15.0 +python-heatclient==1.17.0 +python-keystoneclient==3.18.0 +python-manilaclient==1.26.0 python-mimeparse==1.6.0 -python-neutronclient==6.7.0 -python-novaclient==9.1.0 -python-openstackclient==3.14.0 -python-saharaclient==1.4.0 -python-subunit==1.2.0 -python-swiftclient==3.2.0 -pytz==2018.3 -PyYAML==3.12 -reno==2.5.0 +python-neutronclient==6.11.0 +python-novaclient==11.1.0 +python-pcre==0.7 +python-subunit==1.3.0 +python-swiftclient==3.6.0 +pytz==2018.9 +PyYAML==3.13 +reno==2.11.2 repoze.lru==0.7 requests==2.14.2 requestsexceptions==1.4.0 -restructuredtext-lint==1.1.3 -rfc3986==1.1.0 +restructuredtext-lint==1.2.2 +rfc3986==1.2.0 Routes==2.4.1 -simplejson==3.13.2 +sahara==10.0.0.0b1 +simplejson==3.16.0 six==1.10.0 -smmap2==2.0.3 +smmap2==2.0.5 snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-httpdomain==1.3.0 -sphinxcontrib-websupport==1.0.1 -sqlalchemy-migrate==0.11.0 -SQLAlchemy==1.0.10 +Sphinx==1.8.4 +sphinxcontrib-httpdomain==1.7.0 +sphinxcontrib-websupport==1.1.0 +SQLAlchemy==1.2.17 +sqlalchemy-migrate==0.12.0 sqlparse==0.2.4 -statsd==3.2.2 +statsd==3.3.0 stestr==1.0.0 -stevedore==1.20.0 +stevedore==1.30.0 Tempita==0.5.2 -tenacity==4.9.0 -testresources==2.0.0 +tenacity==5.0.3 +testrepository==0.0.20 +testresources==2.0.1 testscenarios==0.4 testtools==2.2.0 -tooz==1.58.0 +tooz==1.64.0 traceback2==1.4.0 unittest2==1.1.0 -urllib3==1.22 -vine==1.1.4 -voluptuous==0.11.1 +urllib3==1.24.1 +vine==1.2.0 +voluptuous==0.11.5 warlock==1.3.0 -WebOb==1.7.1 +wcwidth==0.1.7 +WebOb==1.8.5 Werkzeug==0.14.1 -wrapt==1.10.11 +whereto==0.4.0 +wrapt==1.11.1 diff --git a/requirements.txt b/requirements.txt index 4cdb2b2..ff6e585 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,44 +4,12 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 -alembic>=0.8.10 # MIT Babel!=2.4.0,>=2.3.4 # BSD -botocore>=1.5.1 # Apache-2.0 -castellan>=0.16.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT -Flask>=1.0.2 # BSD -iso8601>=0.1.11 # MIT -Jinja2>=2.10 # BSD License (3 clause) -jsonschema<3.0.0,>=2.6.0 # MIT -keystoneauth1>=3.4.0 # Apache-2.0 -keystonemiddleware>=4.17.0 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 -oslo.concurrency>=3.26.0 # Apache-2.0 -oslo.context>=2.19.2 # Apache-2.0 -oslo.db>=4.27.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 -oslo.messaging>=5.29.0 # Apache-2.0 -oslo.middleware>=3.31.0 # Apache-2.0 -oslo.policy>=1.30.0 # Apache-2.0 -oslo.rootwrap>=5.8.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 -oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 -oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 -paramiko>=2.0.0 # LGPLv2.1+ requests>=2.14.2 # Apache-2.0 -python-cinderclient>=3.3.0 # Apache-2.0 -python-keystoneclient>=3.8.0 # Apache-2.0 -python-manilaclient>=1.16.0 # Apache-2.0 -python-novaclient>=9.1.0 # Apache-2.0 -python-swiftclient>=3.2.0 # Apache-2.0 -python-neutronclient>=6.7.0 # Apache-2.0 -python-heatclient>=1.10.0 # Apache-2.0 -python-glanceclient>=2.8.0 # Apache-2.0 -sahara +sahara>=10.0.0.0b1 six>=1.10.0 # MIT -stevedore>=1.20.0 # Apache-2.0 -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -tooz>=1.58.0 # Apache-2.0 -WebOb>=1.7.1 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 52c0626..9cffbb1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 -PyMySQL>=0.7.6 # MIT License bandit>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 @@ -13,9 +12,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 -psycopg2>=2.6.2 # LGPL/ZPL pylint==1.4.5 # GPLv2 -testresources>=2.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -python-saharaclient>=1.4.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 6d2f34b..67c4b3b 100644 --- a/tox.ini +++ b/tox.ini @@ -93,4 +93,4 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt - + -r{toxinidir}/doc/requirements.txt