Updated from global requirements

Change-Id: I4716bc17dd898ecf25f730641fc6901ade0da7eb

3 files changed, 15 insertions, 7 deletions

diff --git a/requirements.txt b/requirements.txt
index d67013a..c661d37 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 alembic>=0.4.1
-Babel>=0.9.6
+Babel>=1.3
 iso8601>=0.1.9
 lockfile>=0.8
 oslo.config>=1.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 d7a1da2..c940f8c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,13 +1,13 @@
-hacking>=0.5.6,<0.8
+hacking>=0.8.0,<0.9
 
 coverage>=3.6
 discover
 fixtures>=0.3.14
 MySQL-python
-python-subunit
-sphinx>=1.1.2
+python-subunit>=0.0.18
+sphinx>=1.2.1,<1.3
 oslosphinx
 oslotest
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
+testrepository>=0.0.18
+testscenarios>=0.4
+testtools>=0.9.34