Updated from global requirements

Change-Id: I51dc1466729ca74f807a117995b2796a380209cb

requirements.txt

@@ -2,22 +2,22 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
-WebOb>=1.2.3
-eventlet>=0.17.4
-greenlet>=0.3.2
-PasteDeploy>=1.5.0
-Paste
-Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
-Routes!=2.0,>=1.12.3;python_version!='2.7'
-cryptography>=1.0 # Apache-2.0
-six>=1.9.0
-SQLAlchemy<1.1.0,>=1.0.10
-sqlalchemy-migrate>=0.9.6
+pbr>=1.6 # Apache-2.0
+WebOb>=1.2.3 # MIT
+eventlet>=0.17.4 # MIT
+greenlet>=0.3.2 # MIT
+PasteDeploy>=1.5.0 # MIT
+Paste # MIT
+Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
+Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
+cryptography>=1.0 # BSD/Apache-2.0
+six>=1.9.0 # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+sqlalchemy-migrate>=0.9.6 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
-passlib>=1.6
-python-keystoneclient!=1.8.0,>=1.6.0
-keystonemiddleware>=4.0.0
+passlib>=1.6 # BSD
+python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
+keystonemiddleware>=4.0.0 # Apache-2.0
 oslo.cache>=0.8.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
@@ -31,9 +31,9 @@ oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
 oslo.utils>=3.2.0 # Apache-2.0
-oauthlib>=0.6
-pysaml2>=2.4.0
-dogpile.cache>=0.5.4
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
-pycadf!=2.0.0,>=1.1.0
-msgpack-python>=0.4.0
+oauthlib>=0.6 # BSD
+pysaml2>=2.4.0 # Apache-2.0
+dogpile.cache>=0.5.4 # BSD
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+pycadf!=2.0.0,>=1.1.0 # Apache-2.0
+msgpack-python>=0.4.0 # Apache-2.0

setup.cfg

@@ -22,14 +22,14 @@ packages =
 
 [extras]
 ldap =
-  python-ldap>=2.4:python_version=='2.7'
+  python-ldap>=2.4:python_version=='2.7' # PSF
   ldappool>=1.0:python_version=='2.7' # MPL
 memcache =
-  python-memcached>=1.56
+  python-memcached>=1.56 # PSF
 mongodb =
-  pymongo>=3.0.2
+  pymongo>=3.0.2 # Apache-2.0
 bandit =
-  bandit>=0.13.2
+  bandit>=0.13.2 # Apache-2.0
 
 [global]
 setup-hooks =

test-requirements.txt

@@ -4,36 +4,36 @@
 
 hacking<0.11,>=0.10.0
 pep257==0.7.0 # MIT License
-flake8-docstrings==0.2.1.post1
+flake8-docstrings==0.2.1.post1 # MIT
 bashate>=0.2 # Apache-2.0
 
 # computes code coverage percentages
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
 # fixture stubbing
-fixtures>=1.3.1
+fixtures>=1.3.1 # Apache-2.0/BSD
 # xml parsing
-lxml>=2.3
+lxml>=2.3 # BSD
 # mock object framework
-mock>=1.2
+mock>=1.2 # BSD
 oslotest>=1.10.0 # Apache-2.0
 # required to build documentation
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 # test wsgi apps without starting an http server
-WebTest>=2.0
+WebTest>=2.0 # MIT
 
 # mox was removed in favor of mock. We should not re-enable this module. See
 # discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html
 #mox>=0.5.3
 
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testtools>=1.4.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # For documentation
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 reno>=0.1.1 # Apache2
 
-tempest-lib>=0.13.0
+tempest-lib>=0.13.0 # Apache-2.0
 
 # Functional tests.
-requests!=2.9.0,>=2.8.1
+requests!=2.9.0,>=2.8.1 # Apache-2.0