Updated from global requirements

Change-Id: If278278e133190f289eb5d453b7f41872fdfe2a6

requirements.txt

@@ -4,6 +4,6 @@
 
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
-six>=1.7.0
+six>=1.9.0
 oslo.utils>=1.2.0 # Apache-2.0
 wrapt>=1.7.0 # BSD License

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)

test-requirements.txt

@@ -6,10 +6,10 @@ hacking<0.11,>=0.10.0
 
 coverage>=3.6
 discover
-python-subunit
-sphinx>=1.1.2
-oslosphinx
-oslotest>=1.1.0.0a1
+python-subunit>=0.0.18
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+oslosphinx>=2.2.0  # Apache-2.0
+oslotest>=1.2.0  # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.34
+testtools>=0.9.36,!=1.2.0