Updated from global requirements

It appears os-net-config is not in the sync list for g-r.  We should
add it, but in the meantime this will get us up to date.

Change-Id: I828a394ce72824eaabe904b563f73734a88c21f8

requirements.txt

@@ -1,10 +1,13 @@
-pbr>=0.6,!=0.7,<1.0
-anyjson>=0.3.3
-Babel>=0.9.6
-six>=1.6.0
-eventlet>=0.13.0
-iso8601>=0.1.9
-netaddr>=0.7.6
-oslo.concurrency>=1.4.1 # Apache-2.0
-oslo.utils>=1.2.0 # Apache-2.0
-PyYAML>=3.1.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
+anyjson>=0.3.3 # BSD
+Babel>=2.3.4 # BSD
+six>=1.9.0 # MIT
+eventlet!=0.18.3,>=0.18.2 # MIT
+iso8601>=0.1.11 # MIT
+netaddr!=0.7.16,>=0.7.13 # BSD
+oslo.concurrency>=3.8.0 # Apache-2.0
+oslo.utils>=3.20.0 # Apache-2.0
+PyYAML>=3.10.0 # MIT

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");
@@ -17,6 +16,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>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -1,12 +1,15 @@
-hacking>=0.10.2,<0.11  # 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.11,>=0.10.2 # Apache-2.0
 
-coverage>=3.6
-fixtures>=0.3.14
-python-subunit
-sphinx>=1.1.2
-oslosphinx
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
-mock>=1.0
-mox>=0.5.3
+coverage>=4.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx>=1.5.1 # BSD
+oslosphinx>=4.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
+mox>=0.5.3 # Apache-2.0