Updated from global requirements

Change-Id: I37c846af3f381dfb19e1a4b9992b605959659cf0

requirements.txt

@@ -1,4 +1,7 @@
-Jinja2>=2.6
-pymod2pkg>=0.3
-PyYAML>=3.1.0  # MIT
-packaging>=16.5
+# 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.
+Jinja2>=2.8 # BSD License (3 clause)
+pymod2pkg>=0.3 # Apache-2.0
+PyYAML>=3.1.0 # MIT
+packaging>=15.2 # Apache-2.0

setup.cfg

@@ -22,7 +22,8 @@ classifier =
 
 [extras]
 bandit =
-  bandit>=1.0.1  # Apache-2.0
+  bandit>=1.0.1 # Apache-2.0
+
 [global]
 setup-hooks =
     pbr.hooks.setup_hook

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,8 +1,11 @@
-flake8
-testrepository>=0.0.18
-testresources>=0.2.4
-testtools>=1.4.0
-ddt
+# 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.
+flake8<2.6.0,>=2.5.4 # MIT
+testrepository>=0.0.18 # Apache-2.0/BSD
+testresources>=0.2.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+ddt>=1.0.1 # MIT
 
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0