Updated from global requirements

Change-Id: I90a2a50e2a2824314dc5be8686d884b600ca706a

requirements.txt

@@ -1,17 +1,17 @@
 # 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
-PrettyTable<0.8,>=0.7
-python-glanceclient>=1.2.0
-python-keystoneclient!=1.8.0,>=1.6.0
-httplib2>=0.7.5
-iso8601>=0.1.9
-six>=1.9.0
-Babel>=1.3
-pyOpenSSL>=0.14
-requests!=2.9.0,>=2.8.1
-PyYAML>=3.1.0
+pbr>=1.6 # Apache-2.0
+PrettyTable<0.8,>=0.7 # BSD
+python-glanceclient>=1.2.0 # Apache-2.0
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+httplib2>=0.7.5 # MIT
+iso8601>=0.1.9 # MIT
+six>=1.9.0 # MIT
+Babel>=1.3 # BSD
+pyOpenSSL>=0.14 # Apache-2.0
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+PyYAML>=3.1.0 # MIT
 yaql>=1.0.0 # Apache 2.0 License
 
 oslo.serialization>=1.10.0 # Apache-2.0

test-requirements.txt

@@ -3,17 +3,17 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10
 
-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
 requests-mock>=0.7.0 # Apache-2.0
-tempest-lib>=0.13.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+tempest-lib>=0.13.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # doc build requirements
 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
 reno>=0.1.1 # Apache2