Updated from global requirements

Change-Id: Ib437d4aecd3babf03f4259666f5f6d0ba4418d9f

requirements.txt

@@ -2,38 +2,38 @@
 # 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
 
 # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
-SQLAlchemy<1.1.0,>=1.0.10
-eventlet>=0.17.4
-PasteDeploy>=1.5.0
-Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
-Routes!=2.0,>=1.12.3;python_version!='2.7'
-WebOb>=1.2.3
-sqlalchemy-migrate>=0.9.6
-httplib2>=0.7.5
-pycrypto>=2.6
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+eventlet>=0.17.4 # MIT
+PasteDeploy>=1.5.0 # 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
+WebOb>=1.2.3 # MIT
+sqlalchemy-migrate>=0.9.6 # Apache-2.0
+httplib2>=0.7.5 # MIT
+pycrypto>=2.6 # Public Domain
 oslo.config>=3.2.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
+oslo.utils>=3.4.0 # Apache-2.0
 stevedore>=1.5.0 # Apache-2.0
 futurist>=0.6.0 # Apache-2.0
-taskflow>=1.25.0
-keystoneauth1>=2.1.0
-keystonemiddleware>=4.0.0
-WSME>=0.8
+taskflow>=1.25.0 # Apache-2.0
+keystoneauth1>=2.1.0 # Apache-2.0
+keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
+WSME>=0.8 # MIT
 
 # For paste.util.template used in keystone.common.template
-Paste
+Paste # MIT
 
-jsonschema!=2.5.0,<3.0.0,>=2.0.0
-python-keystoneclient!=1.8.0,>=1.6.0
-pyOpenSSL>=0.14
+jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+pyOpenSSL>=0.14 # Apache-2.0
 # Required by openstack.common libraries
-six>=1.9.0
+six>=1.9.0 # MIT
 
 oslo.db>=4.1.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
@@ -44,19 +44,19 @@ oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
-osprofiler>=0.3.1 # Apache-2.0
+osprofiler>=0.4.0 # Apache-2.0
 
 # Glance Store
 glance-store!=0.9.0,>=0.7.1 # Apache-2.0
 
 
 # Artifact repository
-semantic-version>=2.3.1
+semantic-version>=2.3.1 # BSD
 
 castellan>=0.3.1 # Apache-2.0
-cryptography>=1.0 # Apache-2.0
+cryptography>=1.0 # BSD/Apache-2.0
 debtcollector>=0.3.0 # Apache-2.0
 
 # timeutils
-iso8601>=0.1.9
+iso8601>=0.1.9 # MIT
 monotonic>=0.3 # Apache-2.0

setup.cfg

@@ -84,4 +84,4 @@ warnerrors = True
 
 [extras]
 bandit =
-  bandit>=0.13.2
+  bandit>=0.13.2 # Apache-2.0

test-requirements.txt

@@ -6,28 +6,28 @@
 hacking<0.11,>=0.10.0
 
 # For translations processing
-Babel>=1.3
+Babel>=1.3 # BSD
 
 # Needed for testing
-coverage>=3.6
-fixtures>=1.3.1
-mox3>=0.7.0
-mock>=1.2
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-requests!=2.9.0,>=2.8.1
-testrepository>=0.0.18
-testresources>=0.2.4
-testscenarios>=0.4
-testtools>=1.4.0
-psutil<2.0.0,>=1.1.1
+coverage>=3.6 # Apache-2.0
+fixtures>=1.3.1 # Apache-2.0/BSD
+mox3>=0.7.0 # Apache-2.0
+mock>=1.2 # BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+requests!=2.9.0,>=2.8.1 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testresources>=0.2.4 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+psutil<2.0.0,>=1.1.1 # BSD
 oslotest>=1.10.0 # Apache-2.0
 # Optional packages that should be installed when testing
 PyMySQL>=0.6.2 # MIT License
-psycopg2>=2.5
-pysendfile>=2.0.0
-qpid-python;python_version=='2.7'
-xattr>=0.4
-python-swiftclient>=2.2.0
+psycopg2>=2.5 # LGPL/ZPL
+pysendfile>=2.0.0 # MIT
+qpid-python;python_version=='2.7' # Apache-2.0
+xattr>=0.4 # MIT
+python-swiftclient>=2.2.0 # Apache-2.0
 
 # Documentation
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0