Merge "Update hacking for Python3"

1 files changed, 22 insertions, 2 deletions

diff --git a/tox.ini b/tox.ini
index 75d150886..03334d33c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -107,8 +107,21 @@ commands = bandit -r heat -x tests --skip B101,B104,B107,B110,B310,B311,B404,B41
 
 [flake8]
 show-source = true
+# E117 over-indented
+# E123 closing bracket does not match indentation of opening bracket's line
+# E226 missing whitespace around arithmetic operator
+# E241 multiple spaces after ','
+# E305 expected 2 blank lines after class or function definition, found 1
+# E402 module level import not at top of file
+# E731 do not assign a lambda expression, use a def
+# E741 ambiguous variable name 'l'
+# F841 local variable 'ex' is assigned to but never used
+# W503 line break before binary operator
+# W504 line break after binary operator
+# W605 invalid escape sequence '\ '
+ignore = E117,E123,E226,E241,E305,E402,E731,E741,F841,W503,W504,W605
 exclude=.*,dist,*lib/python*,*egg,build,*convergence/scenarios/*
-max-complexity=20
+max-complexity=23
 
 [doc8]
 ignore = D001
@@ -116,7 +129,14 @@ ignore-path = .venv,.git,.tox,.tmp,*heat/locale*,*lib/python*,openstack_heat.egg
 
 [hacking]
 import_exceptions = heat.common.i18n
-local-check-factory = heat.hacking.checks.factory
+
+[flake8:local-plugins]
+extension =
+    Heat301 = checks:no_log_warn
+    Heat302 = checks:check_python3_no_iteritems
+    Heat303 = checks:check_python3_no_iterkeys
+    Heat304 = checks:check_python3_no_itervalues
+paths = ./heat/hacking
 
 [testenv:debug]
 commands = oslo_debug_helper {posargs}