diff --git a/Makefile b/Makefile index 541c166d..231b2b20 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ lint: tox -elint lint-roll: - isort --recursive tests + isort tests black {toxinidir}/ {toxinidir}/tests setup.py $(MAKE) lint diff --git a/setup.py b/setup.py index e319e3e0..1c8088af 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ extras_require = { ], "lint": [ "flake8==3.7.9", - "isort>=4.2.15,<5", + "isort>=5.10.1,<6", "mypy==0.770", "pydocstyle>=5.0.0,<6", "black>=22,<23", diff --git a/tox.ini b/tox.ini index afe023cf..d1dc3e66 100644 --- a/tox.ini +++ b/tox.ini @@ -7,12 +7,9 @@ envlist= [isort] combine_as_imports=True force_sort_within_sections=True -include_trailing_comma=True known_third_party=hypothesis,pytest known_first_party= -line_length=21 -multi_line_output=3 -use_parentheses=True +profile=black [flake8] max-line-length= 100 @@ -42,6 +39,6 @@ extras=lint commands= mypy -p --config-file {toxinidir}/mypy.ini flake8 {toxinidir}/ {toxinidir}/tests - isort --recursive --check-only --diff {toxinidir}/ {toxinidir}/tests + isort --check-only --diff {toxinidir}/ {toxinidir}/tests pydocstyle --explain {toxinidir}/ {toxinidir}/tests black --check {toxinidir}/ {toxinidir}/tests setup.py