Merge "Updated from global requirements"

requirements.txt

@@ -4,7 +4,7 @@ iso8601>=0.1.4
 PrettyTable>=0.6,<0.8
 requests>=1.1
 simplejson>=2.0.9
-six
+six>=1.4.1
 oslo.config>=1.2.0
 netaddr
-Babel>=0.9.6
+Babel>=1.3

setup.py

@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.21,<1.0'],
+    setup_requires=['pbr'],
     pbr=True)

test-requirements.txt

@@ -1,10 +1,10 @@
 hacking>=0.5.6,<0.8
 coverage>=3.6
 discover
-fixtures>=0.3.12
+fixtures>=0.3.14
 httpretty>=0.6.3
-keyring>=1.6.1
-mock>=0.8.0
+keyring>=1.6.1,<2.0
+mock>=1.0
 mox3>=0.7.0
 pycrypto>=2.6
 sphinx>=1.1.2