From 0ed1f3297290b40649a968304c106d5b5fb5a6e7 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 23 Dec 2020 12:23:15 +0000
Subject: [PATCH] Move flake8 config into setup.cfg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At the moment the two are duplicative, and it’s not clear which takes
precedence.

We need to keep the `excludes` line otherwise running the `flake8`
command takes ~3 times longer and may lint 3rd party files that we don’t
control.
---
 .flake8   | 7 -------
 setup.cfg | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 .flake8

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index fd1d86b57..000000000
--- a/.flake8
+++ /dev/null
@@ -1,7 +0,0 @@
-[flake8]
-# Rule definitions: http://flake8.pycqa.org/en/latest/user/error-codes.html
-# W503: line break before binary operator
-exclude = venv*,__pycache__,node_modules,cache,migrations,build
-ignore = W503
-max-complexity = 14
-max-line-length = 120
diff --git a/setup.cfg b/setup.cfg
index 77880982e..84c3eb929 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,7 @@ xfail_strict=true
 
 
 [flake8]
+exclude = venv*,__pycache__,node_modules,cache,migrations,build
 # W504 line break after binary operator
 extend_ignore=B306, W504
 select=B901