From 4051160c9bd6b99701de15fb71afb8cd83766990 Mon Sep 17 00:00:00 2001 From: Jeremy Liu Date: Tue, 10 Apr 2018 15:29:57 +0800 Subject: [PATCH] Add os-testr as test dependency This is necessary for running functional tests. Also fix unmatched requirements following [1][2]. [1] http://lists.openstack.org/pipermail/openstack-dev/2018-April/129056.html [2] https://review.openstack.org/#/c/558610/ Change-Id: I67de85cf24d40ef5066e0a4668071e890eb65087 Closes-bug: #1762646 --- lower-constraints.txt | 86 ++++++++++++++++++++++--------------------- requirements.txt | 2 +- test-requirements.txt | 1 + 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index b506ca886..bfdec423d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,30 +1,31 @@ alabaster==0.7.10 -alembic==0.9.8 +alembic==0.8.10 amqp==2.2.2 appdirs==1.4.3 asn1crypto==0.24.0 -Babel==2.5.3 -bandit==1.4.0 +Babel==2.3.4 +bandit==1.1.0 bcrypt==3.1.4 beautifulsoup4==4.6.0 cachetools==2.0.1 certifi==2018.1.18 -cffi==1.11.5 +cffi==1.7.0 chardet==3.0.4 cliff==2.11.0 cmd2==0.8.1 contextlib2==0.5.5 -coverage==4.5.1 -cryptography==2.1.4 -ddt==1.1.2 +coverage==4.0 +cryptography==2.1 +ddt==1.0.1 debtcollector==1.19.0 decorator==4.2.1 docutils==0.14 dogpile.cache==0.6.5 +dogtag-pki==10.3.5.1 dulwich==0.19.0 enum-compat==0.0.2 enum34==1.1.6 -eventlet==0.20.0 +eventlet==0.18.2 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 @@ -41,9 +42,9 @@ iso8601==0.1.12 Jinja2==2.10 jsonschema==2.6.0 keystoneauth1==3.4.0 -keystonemiddleware==4.21.0 +keystonemiddleware==4.17.0 kombu==4.1.0 -ldap3==2.4.1 +ldap3==1.0.2 linecache2==1.0.0 logutils==0.3.5 Mako==1.0.7 @@ -55,81 +56,82 @@ mox3==0.25.0 msgpack==0.5.6 netaddr==0.7.19 netifaces==0.10.6 -openstackdocstheme==1.20.0 -os-api-ref==1.5.0 +openstackdocstheme==1.18.1 +os-api-ref==1.4.0 os-client-config==1.29.0 +os-testr==1.0.0 oslo.cache==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 -oslo.context==2.20.0 -oslo.db==4.35.0 -oslo.i18n==3.20.0 -oslo.log==3.37.0 -oslo.messaging==5.36.0 -oslo.middleware==3.35.0 -oslo.policy==1.34.0 -oslo.serialization==2.25.0 -oslo.service==1.30.0 -oslo.utils==3.36.0 -oslotest==3.3.0 +oslo.context==2.19.2 +oslo.db==4.27.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.serialization==2.18.0 +oslo.service==1.24.0 +oslo.utils==3.33.0 +oslotest==3.2.0 paramiko==2.4.1 -Paste==2.0.3 -PasteDeploy==1.5.2 -pbr==3.1.1 -pecan==1.2.1 +Paste==2.0.2 +PasteDeploy==1.5.0 +pbr==2.0.0 +pecan==1.0.0 pep8==1.5.7 -pika==0.10.0 pika-pool==0.1.3 +pika==0.10.0 prettytable==0.7.2 pyasn1==0.4.2 pycadf==2.7.0 pycparser==2.18 -pycrypto==2.6.1 +pycrypto==2.6 pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 PyKMIP==0.7.0 PyNaCl==1.2.1 -pyOpenSSL==17.5.0 +pyOpenSSL==17.1.0 pyparsing==2.2.0 pyperclip==1.6.0 python-dateutil==2.7.0 python-editor==1.0.3 -python-keystoneclient==3.15.0 +python-keystoneclient==3.8.0 python-mimeparse==1.6.0 python-subunit==1.2.0 pytz==2018.3 PyYAML==3.12 -reno==2.7.0 +reno==2.5.0 repoze.lru==0.7 -requests==2.18.4 +requests==2.14.2 requestsexceptions==1.4.0 rfc3986==1.1.0 Routes==2.4.1 -six==1.11.0 +six==1.10.0 smmap2==2.0.3 snowballstemmer==1.2.1 -Sphinx==1.6.5 +Sphinx==1.6.2 sphinxcontrib-websupport==1.0.1 -SQLAlchemy==1.2.5 sqlalchemy-migrate==0.11.0 +SQLAlchemy==1.0.10 sqlparse==0.2.4 statsd==3.2.2 stestr==2.0.0 -stevedore==1.28.0 -tempest==18.0.0 +stevedore==1.20.0 +tempest==17.1.0 Tempita==0.5.2 tenacity==4.9.0 -testrepository==0.0.20 +testrepository==0.0.18 testresources==2.0.1 testscenarios==0.5.0 -testtools==2.3.0 +testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 urllib3==1.22 vine==1.1.4 voluptuous==0.11.1 waitress==1.1.0 -WebOb==1.7.4 -WebTest==2.0.29 +WebOb==1.7.1 +WebTest==2.0.27 wrapt==1.10.11 diff --git a/requirements.txt b/requirements.txt index 7f5c80fec..907a7ebdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ alembic>=0.8.10 # MIT Babel!=2.4.0,>=2.3.4 # BSD cffi>=1.7.0 # MIT cryptography>=2.1 # BSD/Apache-2.0 -eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT +eventlet>=0.18.2,!=0.18.3,!=0.20.1 # MIT jsonschema<3.0.0,>=2.6.0 # MIT oslo.config>=5.2.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index aafdbe1fe..b2ed3bcc7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,6 +9,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 +os-testr>=1.0.0 # Apache-2.0 pykmip>=0.7.0 # Apache 2.0 License testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT