update from global requirements

Author: alvarolopez

requirements.txt

@@ -1,15 +1,19 @@
-pbr>=0.6,!=0.7,<1.0
-oslo.config>=2.3.0
-oslo.log>=1.8.0
-oslo.utils
+# 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.6
+oslo.config>=2.3.0 # Apache-2.0
+oslo.log>=1.8.0 # Apache-2.0
+oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0
 
-six >=1.4.0
+six>=1.9.0
 
-python-novaclient
-python-keystoneclient
-python-glanceclient
-python-ceilometerclient
+python-novaclient!=2.33.0,>=2.28.1
+python-keystoneclient!=1.8.0,<3.0.0,>=1.6.0
+python-glanceclient>=0.18.0
+python-ceilometerclient>=1.5.0
 
 
+python-dateutil>=2.4.2
+
 dirq
-python-dateutil

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

test-requirements.txt

@@ -1,13 +1,16 @@
-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
 discover
-fixtures>=0.3.14
-python-subunit
-sphinx>=1.1.2
-oslosphinx
+fixtures>=1.3.1
+python-subunit>=0.0.18
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.34
+testtools>=1.4.0
 
-mock
+mock>=1.2