diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-10 22:53:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-10 22:53:28 +0000 |
| commit | 0c21f3d156b00ec78abb79478d921998498b3463 (patch) | |
| tree | ad4a01ee619e26f1d4d03285739c21fb77a3cebf /tools | |
| parent | cf3a3379c86415e8b2ecbefaa06da62570d768f0 (diff) | |
| parent | 4e1cab81e334d7d95e2566e7ed3c8836b88d0dd6 (diff) | |
| download | keystone-0c21f3d156b00ec78abb79478d921998498b3463.tar.gz | |
Merge "Cleanup keystoneclient testing requirements"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test-requires | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/test-requires b/tools/test-requires index 738f456ca..d43ec6b01 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -19,7 +19,9 @@ webtest # test wsgi apps without starting an http server distribute>=0.6.24 # for python-keystoneclient -httplib2 +httplib2 # keystoneclient <0.2.1 +requests<1.0 # replaces httplib2 in keystoneclient >=0.2.1 +keyring # swift_auth test dependencies http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift @@ -27,8 +29,3 @@ netifaces # For translations processing Babel - -requests<1.0 - -# keyring is required by python-keystoneclient-master -keyring
\ No newline at end of file |