Skip to content

Commit

Permalink
Update psutil version to >= 3.0.1
Browse files Browse the repository at this point in the history
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]: giampaolo/psutil#664

Change-Id: If811db1aeac7cb7b37c710f1ba79568d7beb101f
  • Loading branch information
timothyb89 authored and Joe Keen committed Feb 2, 2017
1 parent 2a8bf29 commit 9f605ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions tools/tox_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $?

0 comments on commit 9f605ff

Please sign in to comment.