diff --git a/requirements.txt b/requirements.txt index 1a0c8c4b..abb89e10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ gevent>=1.1.1 httplib2>=0.7.5 # MIT netaddr>=0.7.13,!=0.7.16 # BSD ntplib>=0.3.2,<0.4 -psutil<3.1.0 +psutil>=3.0.1 # BSD pymongo>=3.0.2,!=3.1 python-memcached>=1.56 # PSF python-monascaclient>=1.1.0 # Apache-2.0 diff --git a/tools/tox_install.sh b/tools/tox_install.sh index e2175028..b8c43fb8 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -25,10 +25,7 @@ pip install -c"$localfile" openstack-requirements # the current repo. It is listed in constraints file and thus any # install will be constrained and we need to unconstrain it. -# NOTE(dmllr): temporary local uncaping of psutil in upper-constraints -# if it is still 1.x. Remove me when https://review.openstack.org/#/c/333717/ -# merges -edit-constraints "$localfile" -- "$CLIENT_NAME" psutil===3.0.1 +edit-constraints "$localfile" -- "$CLIENT_NAME" pip install -c"$localfile" -U "$@" exit $?