diff --git a/Makefile b/Makefile index 541c166d..abf94549 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,8 @@ lint: tox -elint lint-roll: - isort --recursive tests - black {toxinidir}/ {toxinidir}/tests setup.py + isort tests + black tests setup.py $(MAKE) lint test: 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..0e5a8a1d 100644 --- a/tox.ini +++ b/tox.ini @@ -7,17 +7,14 @@ 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 exclude= venv*,.tox,docs,build -ignore= +extend-ignore= E203 [testenv] usedevelop=True @@ -39,9 +36,10 @@ whitelist_externals=make [testenv:lint] basepython=python extras=lint +whitelist_externals=black 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