diff --git a/scripts/isort b/scripts/isort new file mode 100755 index 000000000..c3b437802 --- /dev/null +++ b/scripts/isort @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +isort --recursive --check-only --settings-path setup.cfg . diff --git a/setup.cfg b/setup.cfg index e26fdfc29..c067a7b52 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,3 +8,11 @@ addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/ [flake8] ignore = E501,W503 exclude = *.*/* + +[tool:isort] +force_single_line = False +include_trailing_comma = True +known_first_party = borgmatic +line_length = 100 +multi_line_output = 3 +skip = .tox diff --git a/test_requirements.txt b/test_requirements.txt index 399a28c85..1b50a7463 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -8,6 +8,7 @@ coverage==4.5.1 docopt==0.6.2 flake8==3.5.0 flexmock==0.10.2 +isort==4.3.19 mccabe==0.6.1 more-itertools==4.3.0 pluggy==0.7.1 diff --git a/tox.ini b/tox.ini index 0701b1686..626eee044 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ install_command = commands = pytest sh scripts/black + sh scripts/isort flake8 . [testenv:black] @@ -24,3 +25,8 @@ commands = deps = -rtest_requirements.txt commands = pytest tests/end-to-end + +[testenv:isort] +deps = {[testenv]deps} +commands = + isort {posargs:--recursive} --settings-path setup.cfg .