Fix check failure on ubuntu-bionic

Failure is caused by packages conflict as below
The conflict is caused by:
    The user requested pyflakes>=2.1.1
    hacking 0.12.0 depends on pyflakes==0.8.1
Also there are further failure on py36, py37
and py38.

Changes:
- update hacking version requirement
- update neutron code branch from master to ussuri
- add oslo.policy<=3.6.0 requirement

Change-Id: I74fd25058cfbe8503f0c9c517028541c1a3c23a7
changes/14/787314/2
Shu Juan Zhang 1 year ago
parent 416bb9c766
commit a21e09f721
  1. 5
      test-requirements.txt
  2. 4
      tox.ini

@ -1,11 +1,11 @@
# 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.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=3.2.0 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
# pyflakes>=2.1.1
coverage>=4.0 # Apache-2.0
discover
@ -18,3 +18,4 @@ testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
mock>=2.0 # BSD
oslo.policy<=3.6.0 # Apache-2.0

@ -12,7 +12,7 @@ setenv =
PYTHONWARNINGS=default::DeprecationWarning
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-egit+https://github.com/openstack/neutron@master#egg=neutron
-egit+https://github.com/openstack/neutron@stable/ussuri#egg=neutron
commands = cp -r {toxinidir}/neutron/plugins/zvm \
{toxinidir}/.tox/{envname}/src/neutron/neutron/plugins/
cp -r {toxinidir}/neutron/plugins/ml2/drivers/zvm \
@ -31,7 +31,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
[flake8]
# TODO(dougwig) -- uncomment this to test for remaining linkages
# N530 direct neutron imports not allowed
ignore = E125,E126,E128,E129,E265,H305,H404,H405,N530
ignore = E125,E126,E128,E129,E265,H216,H305,H404,H405,N530,W504
show-source = true
builtins = _
exclude = ./.*,build,dist,neutron/openstack/common/*,neutron/tests/tempest,doc

Loading…
Cancel
Save