Manually sync with g-r

Change-Id: I4298bb7c2d66632b716b0dbeae64c9dca2b3434d

requirements.txt

@@ -1,7 +1,7 @@
 # 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.
-PyYAML>=3.1.0
-appdirs>=1.3.0
-keystoneauth1>=2.1.0
-requestsexceptions>=1.1.1  # Apache-2.0
+PyYAML>=3.10.0 # MIT
+appdirs>=1.3.0 # MIT License
+keystoneauth1>=3.0.1 # Apache-2.0
+requestsexceptions>=1.2.0 # 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'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -2,20 +2,20 @@
 # 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,!=0.13.0,<0.14  # Apache-2.0
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-coverage>=3.6
+coverage!=4.4,>=4.0 # Apache-2.0
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
-extras
-fixtures>=0.3.14
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
-mock>=1.2
-python-glanceclient>=0.18.0
-python-subunit>=0.0.18
-sphinx>=1.5.1 # BSD
-openstackdocstheme>=1.5.0  # Apache-2.0
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
-reno>=0.1.1  # Apache2
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+extras # MIT
+fixtures>=3.0.0 # Apache-2.0/BSD
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+mock>=2.0 # BSD
+python-glanceclient>=2.7.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.11.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+reno!=2.3.1,>=1.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