Updated from global requirements

Change-Id: I87c2f41a041ebf80a97f1f4b6100800b68f4f137

requirements.txt

@@ -1,22 +1,25 @@
-pbr>=2.0.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.
+pbr>=2.0.0 # Apache-2.0
 
-munch
-decorator
-jmespath
-jsonpatch
-ipaddress
-os-client-config>=1.25.0
-requestsexceptions>=1.1.1
-six
-futures;python_version<'3.2'
+munch>=2.1.0 # MIT
+decorator>=3.4.0 # BSD
+jmespath>=0.9.0 # MIT
+jsonpatch>=1.1 # BSD
+ipaddress>=1.0.7;python_version<'3.3' # PSF
+os-client-config>=1.22.0 # Apache-2.0
+requestsexceptions>=1.2.0 # Apache-2.0
+six>=1.9.0 # MIT
+futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
 
-keystoneauth1>=2.11.0
-netifaces>=0.10.4
-python-novaclient>=2.21.0,!=2.27.0,!=2.32.0
-python-keystoneclient>=0.11.0
-python-cinderclient>=1.3.1
-python-neutronclient>=2.3.10
-python-ironicclient>=0.10.0
-python-designateclient>=2.1.0
+keystoneauth1>=2.18.0 # Apache-2.0
+netifaces>=0.10.4 # MIT
+python-novaclient>=7.1.0 # Apache-2.0
+python-keystoneclient>=3.8.0 # Apache-2.0
+python-cinderclient>=2.0.1 # Apache-2.0
+python-neutronclient>=5.1.0 # Apache-2.0
+python-ironicclient>=1.11.0 # Apache-2.0
+python-designateclient>=1.5.0 # Apache-2.0
 
-dogpile.cache>=0.5.3
+dogpile.cache>=0.6.2 # BSD

setup.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# 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>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -1,13 +1,16 @@
-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
 
-coverage>=3.6
-fixtures>=0.3.14
-mock>=1.0
-python-subunit
-oslosphinx>=2.2.0  # Apache-2.0
-requests-mock
-sphinx>=1.5.0
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
-reno
+coverage>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+mock>=2.0 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+oslosphinx>=4.7.0 # Apache-2.0
+requests-mock>=1.1 # Apache-2.0
+sphinx>=1.5.1 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+reno>=1.8.0 # Apache-2.0