Merge "Updated from global requirements"

requirements.txt

@@ -1,15 +1,15 @@
 # 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
-argparse
-iso8601>=0.1.9
-keystoneauth1>=2.1.0
+pbr>=1.6 # Apache-2.0
+argparse # PSF
+iso8601>=0.1.9 # MIT
+keystoneauth1>=2.1.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
-PrettyTable<0.8,>=0.7
-python-keystoneclient!=1.8.0,>=1.6.0
-requests!=2.9.0,>=2.8.1
-six>=1.9.0
+oslo.utils>=3.4.0 # Apache-2.0
+PrettyTable<0.8,>=0.7 # BSD
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+six>=1.9.0 # MIT
 stevedore>=1.5.0 # Apache-2.0

test-requirements.txt

@@ -3,13 +3,13 @@
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
-coverage>=3.6
-discover
-fixtures>=1.3.1
-mock>=1.2
+coverage>=3.6 # Apache-2.0
+discover # BSD
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-tempest-lib>=0.13.0
-testrepository>=0.0.18
-testtools>=1.4.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+tempest-lib>=0.13.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT