Updated from global requirements

Change-Id: Ie6811fcb0c536447bd605a22b52d6fd2dee2d328

diff --git a/requirements.txt b/requirements.txt
index a14628aae49c8a2feee0cc53a042d75fbaee6108..f7ccf57b7c7bf318e385fbcd4a4cd9c41e9b26b1 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr>=0.6,<1.0
+pbr>=0.6,!=0.7,<1.0
 anyjson>=0.3.3
 argparse
 Babel>=1.3
@@ -15,16 +15,16 @@ paramiko>=1.9.0
 Paste
 PasteDeploy>=1.5.0
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.8.0
 python-novaclient>=2.17.0
-python-swiftclient>=1.6
+python-swiftclient>=2.0.2
 requests>=1.1
 Routes>=1.12.3
 taskflow>=0.1.3,<0.3
 rtslib-fb>=2.1.39
-six>=1.5.2
+six>=1.6.0
 SQLAlchemy>=0.7.8,<=0.9.99
-sqlalchemy-migrate>=0.8.2,!=0.8.4
+sqlalchemy-migrate>=0.9.1
 stevedore>=0.14
 suds>=0.4
 WebOb>=1.2.3

diff --git a/setup.py b/setup.py
index 70c2b3f32bd6d483261621bda3ec22edcb33dc43..736375744d94f6f122f98fab48b8fc77b13d8bec 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,14 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)