diff --git a/test-requirements.txt b/test-requirements.txt index 9b3e7999f402..12f8238d7e3c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.9.2,<0.10 +hacking>=0.10.0,<0.11 coverage>=3.6 discover feedparser diff --git a/tox.ini b/tox.ini index a11de78773e5..17249918c48b 100644 --- a/tox.ini +++ b/tox.ini @@ -62,14 +62,15 @@ commands = {posargs} commands = python setup.py build_sphinx [flake8] -# H803 skipped on purpose per list discussion. # E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126 # The rest of the ignores are TODOs -# New from hacking 0.9: E129, E131, H407, H405, H904 +# New from hacking 0.9: E129, E131, H407, H405 # E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301 -# H305,H306 Skipped due to inability to handle absolute_import +# New from hacking 0.10: H238 +# H306 was mistakenly ignored, TODO to re-add +# Temporarily skip W292 (new in hacking 0.10) -ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H305,H306,H405,H803,H904 +ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405,H238,H306,W292 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools/xenserver* # To get a list of functions that are more complex than 25, set max-complexity # to 25 and run 'tox -epep8'.