summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2014-03-18 17:27:58 -0400
committerAlan Pevec <alan.pevec@redhat.com>2015-06-15 10:09:31 +0200
commit17721421bf577bc9fa7195a01ce17c9095e51cec (patch)
tree82613cf5fe3cb0a9ed56c7fa83938752c1278a7f
parent81eb5d61a364471e506d81984bb4a779bff1db34 (diff)
Limit psutil to <2.0.0icehouse-eol
Icehouse NOTE: psutil was capped in Juno https://bugs.launchpad.net/glance/+bug/1298039 but Icehouse was left uncapped and it was working until psutil 3.0.0 was released on 2015-06-13. As explained in https://bugs.launchpad.net/glance/+bug/1298039/comments/2 ...the author left some of the old methods in place as deprecated versions without actually documenting that, while others he just removed. ... the ones that glance uses are still in place in 2.0.0, although there's no indication as to when that will change (especially since they no longer appear in the documentation). Original Juno commit message: The psutil package recently released psutil version 2.0.0. This version made a significant number of changes that are not backwards-compatible. We should thus restrict the OpenStack psutil requirement to <2.0.0 until we can ensure that our code is compatible with the new API and that the 2.0.0 version of psutil has had time to propogate to the various distros. Needed by: https://review.openstack.org/#/c/78793/ Change-Id: I63d01235a949cd10ba87d41ad428818daaf9a756 Conflicts: global-requirements.txt (cherry picked from commit e4ed27959684f719352dd750ee9c9f3325ed64b0)
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Thierry Carrez <thierry@openstack.org> Code-Review+2: Dave Walker <email@daviey.com> Workflow+1: Dave Walker <email@daviey.com> Submitted-by: Jenkins Submitted-at: Mon, 15 Jun 2015 10:05:02 +0000 Reviewed-on: https://review.openstack.org/191692 Project: openstack/requirements Branch: refs/heads/stable/icehouse
-rw-r--r--global-requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/global-requirements.txt b/global-requirements.txt
index 0331420..c0d5c5b 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -67,7 +67,7 @@ Pillow==2.4.0 # MIT
67pip>=1.4 67pip>=1.4
68posix_ipc 68posix_ipc
69PrettyTable>=0.7,<0.8 69PrettyTable>=0.7,<0.8
70psutil>=1.1.1 70psutil>=1.1.1,<2.0.0
71pyasn1<=0.1.7 71pyasn1<=0.1.7
72pycadf>=0.4.1,<0.6.0 72pycadf>=0.4.1,<0.6.0
73pycrypto>=2.6,<=2.6.1 73pycrypto>=2.6,<=2.6.1