Merge "Constraint flake8 and pyflakes versions"

This commit is contained in:
Zuul 2018-12-03 13:44:53 +00:00 committed by Gerrit Code Review
commit e8ccab40d4
2 changed files with 6 additions and 5 deletions

View File

@ -255,13 +255,13 @@ class BaseServiceTest(base.BaseTestCase):
FAKE_V3_EXTENSIONS = ( FAKE_V3_EXTENSIONS = (
{ {
'resources': { 'resources': {
URL + 'OS-INHERIT/1.0/rel/domain_user_' URL + 'OS-INHERIT/1.0/rel/domain_user_' +
+ 'role_inherited_to_projects': "", 'role_inherited_to_projects': "",
URL + 'OS-SIMPLE-CERT/1.0/rel/ca_certificate': "", URL + 'OS-SIMPLE-CERT/1.0/rel/ca_certificate': "",
URL + 'OS-EP-FILTER/1.0/rel/endpoint_group_to_' URL + 'OS-EP-FILTER/1.0/rel/endpoint_group_to_' +
+ 'project_association': "", 'project_association': "",
URL + 'OS-EP-FILTER/1.0/rel/project_endpoint': "", URL + 'OS-EP-FILTER/1.0/rel/project_endpoint': "",

View File

@ -3,7 +3,8 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking>=0.12.0,<0.13 # Apache-2.0 hacking>=0.12.0,<0.13 # Apache-2.0
pyflakes>=0.8,<=2.0.0 # MIT
flake8<3.0.0 # MIT
coverage>=4.0 # Apache-2.0 coverage>=4.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD python-subunit>=0.0.18 # Apache-2.0/BSD
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0