Merge "Updated from global requirements"

requirements.txt

@@ -14,7 +14,7 @@ Routes>=1.12.3
 WebOb>=1.2.3,<1.3
 wsgiref>=0.1.2
 argparse
-boto>=2.4.0
+boto>=2.4.0,!=2.13.0
 sqlalchemy-migrate>=0.7.2
 httplib2
 kombu>=2.4.8
@@ -36,9 +36,9 @@ Paste
 
 passlib
 jsonschema>=1.3.0,!=1.4.0
-python-cinderclient>=1.0.4
-python-keystoneclient>=0.3.0
+python-cinderclient>=1.0.5
+python-keystoneclient>=0.3.2
 pyOpenSSL
 
 # Required by openstack.common libraries
-six
+six>=1.4.1

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,15 +1,15 @@
 # Install bounded pep8/pyflakes first, then let flake8 install
 pep8==1.4.5
-pyflakes==0.7.2
+pyflakes>=0.7.2,<0.7.4
 flake8==2.0
-hacking>=0.5.6,<0.7
+hacking>=0.5.6,<0.8
 
 # For translations processing
-Babel>=0.9.6
+Babel>=1.3
 
 # Needed for testing
 coverage>=3.6
-fixtures>=0.3.12
+fixtures>=0.3.14
 mox>=0.5.3
 nose
 nose-exclude