Update to match latest global-requirements

Update requirements to the levels defined in OpenStack
global-requirements on 2016-1-10.

Change-Id: I2818c74817c6ab54c8a73661c8ef50c1d165a080

requirements.txt

@@ -1,11 +1,14 @@
-amqp>=1.4.0,<2.0 # LGPL
-pbr>=1.6
-Babel>=2.3.4  # BSD
-six>=1.9.0
-oslo.config>=3.10.0  # Apache-2.0
-oslo.log>=1.14.0  # Apache-2.0
-oslo.serialization>=1.10.0              # Apache-2.0
-oslo.utils>=3.11.0                       # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+amqp<2.0,>=1.4.0 # LGPL
+pbr>=1.8 # Apache-2.0
+Babel>=2.3.4 # BSD
+six>=1.9.0 # MIT
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.utils>=3.18.0 # Apache-2.0
 pypowervm
-taskflow>=1.26.0  # Apache-2.0
-setuptools>=16.0
+taskflow>=2.7.0 # Apache-2.0
+setuptools!=24.0.0,>=16.0 # PSF/ZPL

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'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -1,17 +1,20 @@
-hacking>=0.11.0,<0.12  # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+hacking<0.12,>=0.11.0 # Apache-2.0
 
 bashate>=0.2 # Apache-2.0
-coverage>=3.6
-discover
-fixtures>=3.0.0  # Apache-2.0/BSD
-pycrypto>=2.6  # Public Domain
-python-subunit>=0.0.18  # Apache-2.0/BSD
-python-swiftclient>=2.7.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3  # BSD
-oslosphinx>=2.5.0,!=3.4.0  # Apache-2.0
-oslotest>=1.10.0  # Apache-2.0
-os-testr>=0.7.0  # Apache-2.0
-testrepository>=0.0.18  # Apache-2.0/BSD
-testscenarios>=0.4  # Apache-2.0/BSD
-testtools>=1.4.0  # MIT
-mock>=2.0  # BSD
+coverage>=4.0 # Apache-2.0
+discover # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
+pycrypto>=2.6 # Public Domain
+python-subunit>=0.0.18 # Apache-2.0/BSD
+python-swiftclient>=3.2.0 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+os-testr>=0.8.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+mock>=2.0 # BSD