Merge "Updated from global requirements"

requirements.txt

@@ -1,13 +1,13 @@
 # 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
+pbr>=1.6 # Apache-2.0
-Babel>=1.3
+Babel>=1.3 # BSD
-argparse
+argparse # PSF
-PrettyTable<0.8,>=0.7
+PrettyTable<0.8,>=0.7 # BSD
-python-keystoneclient!=1.8.0,>=1.6.0
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
-requests!=2.9.0,>=2.8.1
+requests!=2.9.0,>=2.8.1 # Apache-2.0
-warlock<2,>=1.0.1
+warlock<2,>=1.0.1 # Apache-2.0
-six>=1.9.0
+six>=1.9.0 # MIT
 oslo.utils>=3.2.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -3,16 +3,16 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
-discover
+discover # BSD
-mock>=1.2
+mock>=1.2 # BSD
-ordereddict
+ordereddict # MIT
-os-client-config>=1.13.1
+os-client-config>=1.13.1 # Apache-2.0
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-testrepository>=0.0.18
+testrepository>=0.0.18 # Apache-2.0/BSD
-testtools>=1.4.0
+testtools>=1.4.0 # MIT
-testscenarios>=0.4
+testscenarios>=0.4 # Apache-2.0/BSD
-fixtures>=1.3.1
+fixtures>=1.3.1 # Apache-2.0/BSD
 requests-mock>=0.7.0 # Apache-2.0
-tempest-lib>=0.13.0
+tempest-lib>=0.13.0 # Apache-2.0