From c401417ff4e6ee35fe338133bce5cb695c01db97 Mon Sep 17 00:00:00 2001 From: miruka Date: Sun, 15 Nov 2020 16:13:42 -0400 Subject: [PATCH] Use flake8-isort plugin rather than isort Simpler to use and has color output --- mirage.pro | 5 +---- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mirage.pro b/mirage.pro index 9eefd04f..a00d4c80 100644 --- a/mirage.pro +++ b/mirage.pro @@ -79,10 +79,7 @@ no-x11 { # Add `make test` command -test.commands = echo && -test.commands += flake8 src/backend && -test.commands += isort --check-only $$glob_filenames(*.py) && -test.commands += mypy --pretty src/backend +test.commands = flake8 src/backend && mypy --pretty src/backend QMAKE_EXTRA_TARGETS += test diff --git a/requirements-dev.txt b/requirements-dev.txt index 1da6b9ee..3032eafd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,9 +2,9 @@ remote_pdb >= 2.0.0, < 3 pdbpp >= 0.10.2, < 0.11 pprintpp >= 0.4.0, < 0.5 -isort >= 5.6.4, < 6 mypy >= 0.790, < 0.800 flake8 >= 3.8.4, < 4 +flake8-isort >= 4.0.0, < 5 flake8-bugbear >= 20.1.4, < 21 flake8-commas >= 2.0.0, < 3 flake8-comprehensions >= 3.3.0, < 4