From 490bafe8d805c166b5b54b52ceb1f0c414244160 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 22 Jan 2016 14:49:25 -0500 Subject: [PATCH] flake8: Fix use of --select and --ignore. The flake8 command evolved over a series of patches and now includes the use of both --select and --ignore. Unfortunately, this wasn't doing what I thought. The use of --select completely overrides what --ignore does, meaning that we were only currently enforcing a small number of warnings specified in --select. This patch runs flake8 twice, once with --select and once with --ignore to actually enforce the full desired set of warnings. No additional violations had been introduced, but I noticed this while working on some other patches. Signed-off-by: Russell Bryant Acked-by: Ben Pfaff --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 438b78c9f..4ca5e9c29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -366,7 +366,9 @@ ALL_LOCAL += flake8-check # H233 Python 3.x incompatible use of print operator # H238 old style class declaration, use new style (inherit from `object`) flake8-check: $(FLAKE8_PYFILES) - $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi + $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 ${FLAKE8_FLAGS} && \ + flake8 $^ --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then \ + touch $@; else exit 1; fi endif include $(srcdir)/manpages.mk -- 2.20.1