Updated from global requirements

Change-Id: I41e63a06f85e17afa99f07df06ed2848032d449f

3 files changed, 15 insertions, 7 deletions

diff --git a/requirements.txt b/requirements.txt
index 269c641..c5d0c65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-Babel>=0.9.6
-six>=1.6.0
+Babel>=1.3
+six>=1.7.0
 iso8601>=0.1.9
-oslo.config>=1.2.0
-oslo.i18n>=0.1.0
+oslo.config>=1.4.0.0a3
+oslo.i18n>=0.2.0  # Apache-2.0
diff --git a/setup.py b/setup.py
index 70c2b3f..7363757 100755
--- 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)
diff --git a/test-requirements.txt b/test-requirements.txt
index 7b64565..043d97f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ python-subunit>=0.0.18
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
-oslotest
+oslotest>=1.1.0.0a1
 
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
@@ -14,8 +14,8 @@ oslotest
 coverage>=3.6
 
 # this is required for the docs build jobs
-sphinx>=1.2.1,<1.3
-oslosphinx
+sphinx>=1.1.2,!=1.2.0,<1.3
+oslosphinx>=2.2.0.0a2
 
 # mocking framework
 mock>=1.0