Merge "Cleanup keystoneclient testing requirements"

This commit is contained in:
Jenkins
2013-01-10 22:53:28 +00:00
committed by Gerrit Code Review

View File

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