Merge "Update requirements.txt and test-requirements.txt"

Author: Jenkins

requirements.txt

@@ -1,8 +1,8 @@
 pbr>=0.5.21,<1.0
 cliff>=1.4
-keyring>=1.6.1
+keyring>=1.6.1,<2.0
 pycrypto>=2.6
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
+python-keystoneclient>=0.3.2
 python-novaclient>=2.12.0
-python-cinderclient>=1.0.4
+python-cinderclient>=1.0.5

test-requirements.txt

@@ -1,13 +1,14 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-hacking>=0.5.6,<0.7
+hacking>=0.5.6,<0.8
 
 coverage>=3.6
 discover
-fixtures>=0.3.12
-mock>=0.8.0
+fixtures>=0.3.14
+httpretty>=0.6.3
+mock>=1.0
+mox3>=0.7.0
 sphinx>=1.1.2
 testrepository>=0.0.17
 testtools>=0.9.32
+WebOb>=1.2.3,<1.3
+
+Babel>=0.9.6