From 5c05fc7d8e23c13b879558ff25206d4941ade3fc Mon Sep 17 00:00:00 2001
From: Dan Braghis <dan.braghis@torchbox.com>
Date: Fri, 16 Oct 2020 15:55:15 +0100
Subject: [PATCH] Bump isort requirement for testing and update configuration

---
 setup.cfg | 2 ++
 setup.py  | 5 +++--
 tox.ini   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 364a1747d9..5c89bfe80f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,8 @@ multi_line_output=4
 skip=migrations,project_template
 known_first_party=wagtail
 default_section=THIRDPARTY
+lines_between_types=1
+lines_after_imports=2
 
 [tool:pytest]
 django_find_project = false
diff --git a/setup.py b/setup.py
index a306953dae..582f53a716 100755
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,9 @@
 from wagtail import __version__
 from wagtail.utils.setup import assets, check_bdist_egg, sdist
 
+
 try:
-    from setuptools import setup, find_packages
+    from setuptools import find_packages, setup
 except ImportError:
     from distutils.core import setup
 
@@ -55,7 +56,7 @@ testing_extras = [
     # For coverage and PEP8 linting
     'coverage>=3.7.0',
     'flake8>=3.6.0',
-    'isort==4.2.5',
+    'isort>=5.6.0,<6.0',
     'flake8-blind-except==0.1.1',
     'flake8-print==2.0.2',
     'doc8==0.8.1',
diff --git a/tox.ini b/tox.ini
index 07f9ff9124..2316878cf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,5 +60,5 @@ setenv =
 
 [testenv:flake8]
 basepython=python3.6
-deps=flake8>=2.2.0
+deps=flake8>=3.6.0
 commands=flake8