diff --git a/requirements.txt b/requirements.txt index f98d9a517f..2c0e914ff2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,30 +1,30 @@ # 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 -SQLAlchemy<1.1.0,>=1.0.10 -eventlet>=0.17.4 -keystonemiddleware>=4.0.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 -PasteDeploy>=1.5.0 -Paste -sqlalchemy-migrate>=0.9.6 -netaddr!=0.7.16,>=0.7.12 -netifaces>=0.10.4 -httplib2>=0.7.5 -lxml>=2.3 -passlib>=1.6 -python-heatclient>=0.6.0 -python-novaclient!=2.33.0,>=2.29.0 -python-cinderclient>=1.3.1 -python-keystoneclient!=1.8.0,>=1.6.0 -python-swiftclient>=2.2.0 -python-designateclient>=1.5.0 -python-neutronclient>=2.6.0 -iso8601>=0.1.9 -jsonschema!=2.5.0,<3.0.0,>=2.0.0 +pbr>=1.6 # Apache-2.0 +SQLAlchemy<1.1.0,>=1.0.10 # MIT +eventlet>=0.17.4 # MIT +keystonemiddleware>=4.0.0 # Apache-2.0 +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 +PasteDeploy>=1.5.0 # MIT +Paste # MIT +sqlalchemy-migrate>=0.9.6 # Apache-2.0 +netaddr!=0.7.16,>=0.7.12 # BSD +netifaces>=0.10.4 # MIT +httplib2>=0.7.5 # MIT +lxml>=2.3 # BSD +passlib>=1.6 # BSD +python-heatclient>=0.6.0 # Apache-2.0 +python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 +python-cinderclient>=1.3.1 # Apache-2.0 +python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0 +python-swiftclient>=2.2.0 # Apache-2.0 +python-designateclient>=1.5.0 # Apache-2.0 +python-neutronclient>=2.6.0 # Apache-2.0 +iso8601>=0.1.9 # MIT +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT Jinja2>=2.8 # BSD License (3 clause) pexpect!=3.3,>=3.1 # ISC License oslo.config>=3.2.0 # Apache-2.0 @@ -35,9 +35,9 @@ oslo.serialization>=1.10.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 oslo.concurrency>=2.3.0 # Apache-2.0 -MySQL-python;python_version=='2.7' -Babel>=1.3 -six>=1.9.0 +MySQL-python;python_version=='2.7' # GPL +Babel>=1.3 # BSD +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0 osprofiler>=0.4.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 15b861f92f..b0b2c2d619 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,24 +3,24 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 hacking<0.11,>=0.10.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 reno>=0.1.1 # Apache2 -coverage>=3.6 -nose -nosexcover -openstack-doc-tools>=0.23 -openstack.nose-plugin>=0.7 -WebTest>=2.0 +coverage>=3.6 # Apache-2.0 +nose # LGPL +nosexcover # BSD +openstack-doc-tools>=0.23 # Apache-2.0 +openstack.nose-plugin>=0.7 # Apache-2.0 +WebTest>=2.0 # MIT wsgi-intercept>=0.6.1 # MIT License -proboscis>=1.2.5.3 +proboscis>=1.2.5.3 # Apache-2.0 http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient -mock>=1.2 -mox3>=0.7.0 -testtools>=1.4.0 -testrepository>=0.0.18 -pymongo>=3.0.2 -redis>=2.10.0 -psycopg2>=2.5 +mock>=1.2 # BSD +mox3>=0.7.0 # Apache-2.0 +testtools>=1.4.0 # MIT +testrepository>=0.0.18 # Apache-2.0/BSD +pymongo>=3.0.2 # Apache-2.0 +redis>=2.10.0 # MIT +psycopg2>=2.5 # LGPL/ZPL