Updated from global requirements

Change-Id: I5a08a36f08e8a5ade5721dfe7352c1113093c3a7

requirements.txt

@@ -1,3 +1,6 @@
-pbr>=1.3,<2.0
-Babel>=0.9.6
-diskimage-builder
+# 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>=1.8 # Apache-2.0
+Babel>=2.3.4 # BSD
+diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1,>=1.1.2 # Apache-2.0

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

test-requirements.txt

@@ -1,11 +1,14 @@
-hacking>=0.9.2,<0.10
+# 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.10,>=0.9.2
 
-coverage>=3.6
-fixtures>=0.3.14
-python-subunit
-sphinx>=1.1.2
-oslosphinx>=4.7.0  # Apache-2.0
-testrepository>=0.0.17
-testscenarios>=0.4,<0.5
-testtools>=0.9.32
-mock>=1.0
+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.3b1,<1.4,>=1.2.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