From c82e6f9e148ef08d6e2cf95a1656eef6b6be331d Mon Sep 17 00:00:00 2001 From: Guillaume Andreu Sabater Date: Mon, 11 Oct 2021 17:16:47 +0200 Subject: [PATCH] flake8 4.x compat --- .travis.yml | 25 ++++++++++++++++++++----- setup.py | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bc57bc..17dcd2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,34 @@ python: - 'pypy' - 'pypy3' env: - - ISORT_VER="4" - - ISORT_VER="5" + - ISORT_VER="4" FLAKE8_VER="3" + - ISORT_VER="5" FLAKE8_VER="3" + - ISORT_VER="4" FLAKE8_VER="4" + - ISORT_VER="5" FLAKE8_VER="4" jobs: exclude: - python: "2.7" - env: ISORT_VER="5" + env: ISORT_VER="5" FLAKE8_VER="3" + - python: "2.7" + env: ISORT_VER="5" FLAKE8_VER="4" + - python: "2.7" + env: ISORT_VER="4" FLAKE8_VER="4" + - python: "3.5" + env: ISORT_VER="5" FLAKE8_VER="3" - python: "3.5" - env: ISORT_VER="5" + env: ISORT_VER="5" FLAKE8_VER="4" + - python: "3.5" + env: ISORT_VER="4" FLAKE8_VER="4" + - python: "pypy" + env: ISORT_VER="5" FLAKE8_VER="3" + - python: "pypy" + env: ISORT_VER="5" FLAKE8_VER="4" - python: "pypy" - env: ISORT_VER="5" + env: ISORT_VER="4" FLAKE8_VER="4" cache: pip install: - if [[ $ISORT_VER == "4" ]]; then pip install 'isort < 5'; fi + - if [[ $FLAKE8_VER == "3" ]]; then pip install 'flake8 < 4'; fi - pip install .[test] script: - flake8 *.py diff --git a/setup.py b/setup.py index a2628be..1519042 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def get_version(file="flake8_isort.py"): test_suite='run_tests', zip_safe=False, install_requires=[ - 'flake8 >= 3.2.1, <4', + 'flake8 >= 3.2.1, <5', 'isort >= 4.3.5, <6', 'testfixtures >= 6.8.0, <7', ],