openstack
/
monasca-agent
Code Issues Proposed changes

Update psutil version to >= 3.0.1 

This bumps the psutil requirement to >= 3.0.1 to match the new upper
constraint in the global requirements [1]. This also removes the local
capping of psutil to version 3.0.1.

Removing the 3.0.1 cap is also necessary to run the agent in
environments using the musl libc, such as Alpine Linux, due to an issue
resolved in more recent releases [2].

[1]: https://review.openstack.org/#/c/420837/
[2]: https://github.com/giampaolo/psutil/issues/664

Change-Id: If811db1aeac7cb7b37c710f1ba79568d7beb101f
This commit is contained in:
Tim Buckley 2017-01-31 14:22:28 -07:00 committed by Joe Keen
parent 2a8bf2926d
commit 9f605ff395
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -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

5
tools/tox_install.sh
View File

@ -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 $?