Updated from global requirements

Change-Id: I7679832bf67cc88149f96d9480bf8750b5679bae

requirements.txt

@@ -1,10 +1,13 @@
-pbr>=1.6
-cliff>=1.6.0
-PrettyTable>=0.7,<0.8
-python-keystoneclient>=0.10.0
-requests>=1.2.1
-six>=1.7.0
-Babel>=1.3
+# 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
+cliff>=2.3.0 # Apache-2.0
+PrettyTable<0.8,>=0.7.1 # BSD
+python-keystoneclient>=3.8.0 # Apache-2.0
+requests!=2.12.2,>=2.10.0 # Apache-2.0
+six>=1.9.0 # MIT
+Babel>=2.3.4 # BSD
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.log>=3.11.0 # Apache-2.0
 oslo.utils>=3.18.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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -1,9 +1,12 @@
-hacking>=0.10.2,<0.11
-discover
-mock>=1.0
-mox>=0.5.3
+# 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
+discover # BSD
+mock>=2.0 # BSD
+mox>=0.5.3 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-fixtures>=0.3.14
-testrepository>=0.0.18
-testtools>=0.9.34
-coverage>=3.6
+fixtures>=3.0.0 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+coverage>=4.0 # Apache-2.0