Merge "Sync with global requirements"

requirements.txt

@@ -1,8 +1,11 @@
-PyYAML
+# The order of packages is significant, because pip processes them in the order
-jinja2
+# of appearance. Changing the order has an impact on the overall integration
-pip>=7.0
+# process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+PyYAML>=3.1.0
+Jinja2>=2.6 # BSD License (3 clause)
+pip>=6.0
+pbr<2.0,>=1.3
 Babel>=1.3
-oslo.config>=1.11.0
+oslo.config>=1.11.0 # Apache-2.0
-oslo.log>=1.2.0
+oslo.log>=1.6.0 # Apache-2.0
 six>=1.9.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.3'],
     pbr=True)

test-requirements.txt

@@ -7,9 +7,9 @@ hacking<0.11,>=0.10.0
 coverage>=3.6
 discover
 python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx>=2.2.0  # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.2.0  # Apache-2.0
+oslotest>=1.7.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0