From b85c34016351141086db0ade3e2e81880a216c9f Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 22 Jun 2016 16:51:40 +0100
Subject: [PATCH] Move flake8 config to setup.cfg
---
setup.cfg | 5 +++++
tox.ini | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index 433dd204a0..0084e9162a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,11 @@
[bdist_wheel]
universal = 1
+[flake8]
+ignore = E501,E303
+exclude = wagtail/project_template/*
+max-line-length = 120
+
[isort]
line_length=100
multi_line_output=4
diff --git a/tox.ini b/tox.ini
index 640ce59cc2..49293a7c42 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,11 +6,6 @@ envlist = py{27,33,34,35}-dj{18,19}-{sqlite,postgres,mysql}-{elasticsearch,noela
py{27,34,35}-dj110-{sqlite,postgres,mysql}-{elasticsearch,noelasticsearch},
flake8
-[flake8]
-ignore = E501,E303
-exclude = wagtail/project_template/*
-max-line-length = 120
-
[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
commands =