Merge "Sync requirements with OpenStack/requirements"

requirements.txt

@@ -1,26 +1,26 @@
 d2to1>=0.2.10,<0.3
-pbr>=0.5.13,<0.6
-SQLAlchemy>=0.7.8,<0.7.99
+pbr>=0.5.16,<0.6
+sqlalchemy>=0.7,<=0.7.99
 amqplib>=0.6.1
-anyjson>=0.2.4
+anyjson>=0.3.3
 argparse
-eventlet>=0.9.17
-kombu>=1.0.4
+eventlet>=0.12.0
+kombu>2.4.7
 lxml>=2.3
-WebOb==1.2.3
-greenlet>=0.3.1
-sqlalchemy-migrate>=0.7.2
-netaddr>=0.7.6
+webob>=1.2.3,<1.3
+greenlet>=0.3.2
+sqlalchemy-migrate>=0.7
+netaddr
 suds>=0.4
-paramiko
-Babel>=0.9.6
+paramiko>=1.8.0
+babel>=0.9.6
 iso8601>=0.1.4
 setuptools_git>=0.4
 python-quantumclient>=2.2.0,<3.0.0
-python-glanceclient>=0.5.0,<2
-python-keystoneclient>=0.2.0
-stevedore>=0.7
+python-glanceclient>=0.9.0,<2
+python-keystoneclient>=0.2,<0.3
+stevedore>=0.9
 websockify<0.4
 oslo.config>=1.1.0
 pecan>=0.2.0
-wsme>=0.5b1
+wsme>=0.5b2

test-requirements.txt

@@ -3,13 +3,12 @@ pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
 hacking>=0.5.3,<0.6
-
 coverage>=3.6
 discover
 fixtures>=0.3.12
-mox==0.5.3
-MySQL-python
+mox>=0.5.3
+mysql-python
 python-subunit
 sphinx>=1.1.2
 testrepository>=0.0.13
-testtools>=0.9.27
+testtools>=0.9.32