From cf0c6c5d65fd0792c4da67cd93fabade4af22ca0 Mon Sep 17 00:00:00 2001
From: Wayne Werner <wwerner@saltstack.com>
Date: Fri, 10 Apr 2020 09:10:05 -0500
Subject: [PATCH] Back to .isort.cfg

At least until version 5 of isort is actually released.
---
 .isort.cfg              | 8 ++++++++
 .pre-commit-config.yaml | 1 -
 pyproject.toml          | 9 ---------
 3 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 .isort.cfg

diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 00000000000..ba36ac948c8
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,8 @@
+[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 80be322afa8..e8f893b0971 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -423,7 +423,6 @@ repos:
     rev: '1e78a9acf3110e1f9721feb591f89a451fc9876a'
     hooks:
       - id: isort
-        additional_dependencies: ['isort[pyproject]']
         # 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 e50a3ce4bd3..8df0026a14b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,12 +5,3 @@ exclude= '''
   | tests/kitchen
   | templates
 )/
-
-
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-line_length = 88
-skip=salt/ext,tests/kitchen,templates