Merge pull request #56586 from waynew/black-with-any-salt

Pre-commit fixes

.isort.cfg

@@ -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/

.pre-commit-config.yaml

@@ -1,3 +1,6 @@
+default_language_version:
+    python: python3
+
 exclude: ^(doc/_static/.*|doc/_themes/.*)$
 repos:
   - repo: https://github.com/saltstack/pip-tools-compile-impersonate
@@ -420,12 +423,28 @@ 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: >
+            (?x)^(
+                templates/.*|
+                salt/ext/.*|
+                tests/kitchen/.*
+            )$
 
   - repo: https://github.com/psf/black
     rev: stable
     hooks:
       - id: black
-        language_version: python3.7
+        # This tells pre-commit not to pass files to black.
+        # This should be kept in sync with pyproject.toml
+        exclude: >
+            (?x)^(
+                templates/.*|
+                salt/ext/.*|
+                tests/kitchen/.*
+            )$
 
   - repo: https://github.com/saltstack/salt-nox-pre-commit
     rev: master

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"
+