From 7d42fee94a309d36a92ca104449e62641be022d7 Mon Sep 17 00:00:00 2001 From: Wayne Werner Date: Fri, 10 Apr 2020 14:52:32 -0500 Subject: [PATCH] Fix toml file --- .isort.cfg | 8 -------- .pre-commit-config.yaml | 1 + pyproject.toml | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 .isort.cfg diff --git a/.isort.cfg b/.isort.cfg deleted file mode 100644 index ba36ac948c8..00000000000 --- a/.isort.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[settings] -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -line_length=88 -ensure_newline_before_comments=True -use_parentheses=True -skip=salt/ext/,tests/kitchen/tests/,templates/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e8f893b0971..1b852f60125 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -423,6 +423,7 @@ repos: rev: '1e78a9acf3110e1f9721feb591f89a451fc9876a' hooks: - id: isort + additional_dependencies: ['toml'] # This tells pre-commit not to pass files to isort. # This should be kept in sync with pyproject.toml exclude: > diff --git a/pyproject.toml b/pyproject.toml index 8df0026a14b..afc8a6fae3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,18 @@ [tool.black] -exclude= ''' -\( +exclude= """ +/( salt/ext | tests/kitchen | templates )/ +""" + +[tool.isort] +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true +line_length = 88 +ensure_newline_before_comments=true +skip="salt/ext,tests/kitchen,templates" +