Merge "testtools was moved to main requirements file"

This commit is contained in:
Jenkins 2016-01-27 14:36:11 +00:00 committed by Gerrit Code Review
commit 54f813f9c4
2 changed files with 2 additions and 2 deletions

View File

@ -18,7 +18,8 @@ six>=1.9.0 # MIT
netaddr!=0.7.16,>=0.7.12 # BSD netaddr!=0.7.16,>=0.7.12 # BSD
PyYAML>=3.1.0 # MIT PyYAML>=3.1.0 # MIT
jsonpatch>=1.1 # BSD jsonpatch>=1.1 # BSD
keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0 keystonemiddleware>=4.0.0,!=4.1.0 # Apache-2.0
testtools>=1.4.0 # MIT
yaql>=1.0.0 # Apache 2.0 License yaql>=1.0.0 # Apache 2.0 License
# For paste.util.template used in keystone.common.template # For paste.util.template used in keystone.common.template

View File

@ -14,7 +14,6 @@ tempest-lib>=0.13.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testresources>=0.2.4 # Apache-2.0/BSD testresources>=0.2.4 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
unittest2 # BSD unittest2 # BSD
pylint==1.4.5 # GNU GPL v2 pylint==1.4.5 # GNU GPL v2
requests!=2.9.0,>=2.8.1 # Apache-2.0 requests!=2.9.0,>=2.8.1 # Apache-2.0