diff --git a/bindep.txt b/bindep.txt index 1b7d9901d9c..a5ae14f523b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -30,3 +30,6 @@ postgresql-client [platform:dpkg] postgresql-devel [platform:rpm] postgresql-server [platform:rpm] thin-provisioning-tools [platform:debian] +libxml2-dev [platform:dpkg test] +libxslt-devel [platform:rpm test] +libxslt1-dev [platform:dpkg test] diff --git a/lower-constraints.txt b/lower-constraints.txt index 3f912342b99..41cc9e65c15 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -48,7 +48,7 @@ Jinja2==2.10 jsonpatch==1.21 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.4.0 +keystoneauth1==3.7.0 keystonemiddleware==4.17.0 kombu==4.1.0 linecache2==1.0.0 @@ -75,7 +75,7 @@ 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.messaging==6.4.0 oslo.middleware==3.31.0 oslo.policy==1.30.0 oslo.privsep==1.23.0 @@ -83,7 +83,7 @@ oslo.reports==1.18.0 oslo.rootwrap==5.8.0 oslo.serialization==2.18.0 oslo.service==1.24.0 -oslo.utils==3.33.0 +oslo.utils==3.34.0 oslo.versionedobjects==1.31.2 oslo.vmware==2.17.0 oslotest==3.2.0 diff --git a/requirements.txt b/requirements.txt index 3fb1d598319..9f13745d089 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ httplib2>=0.9.1 # MIT iso8601>=0.1.11 # MIT jsonschema<3.0.0,>=2.6.0 # MIT ipaddress>=1.0.17;python_version<'3.3' # PSF -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=3.7.0 # Apache-2.0 keystonemiddleware>=4.17.0 # Apache-2.0 lxml!=3.7.0,>=3.4.1 # BSD oauth2client!=4.0.0,>=1.5.0 # Apache-2.0 @@ -22,7 +22,7 @@ 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.log>=3.36.0 # Apache-2.0 -oslo.messaging>=5.29.0 # Apache-2.0 +oslo.messaging>=6.4.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=1.30.0 # Apache-2.0 oslo.privsep>=1.23.0 # Apache-2.0 @@ -31,7 +31,7 @@ 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 +oslo.utils>=3.34.0 # Apache-2.0 oslo.versionedobjects>=1.31.2 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 paramiko>=2.0.0 # LGPLv2.1+ diff --git a/tox.ini b/tox.ini index b9cf6c77298..49d5cde9d5e 100644 --- a/tox.ini +++ b/tox.ini @@ -12,9 +12,10 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_TIMEOUT=60 OS_TEST_PATH=./cinder/tests/unit usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install {opts} {packages} -deps = -r{toxinidir}/test-requirements.txt +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt # By default stestr will set concurrency # to ncpu, to specify something else use