From 4be13151844a15fd22ec3952a7123ad3928cc289 Mon Sep 17 00:00:00 2001
From: Jai <jai@jai.one>
Date: Sat, 10 Feb 2024 22:46:50 -0800
Subject: [PATCH] Make isort use black profile to prevent conflicts

---
 .github/workflows/checks.yml | 2 +-
 .pre-commit-config.yaml      | 3 ++-
 .vscode/settings.json        | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 397ae1dd..a1abbf67 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -29,6 +29,6 @@ jobs:
       - name: black
         run: black --check .
       - name: isort
-        run: isort --check .
+        run: isort --profile black --check .
       - name: pytest
         run: pytest
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 84fc89ad..a841252d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,4 +8,5 @@ repos:
     rev: 5.13.2
     hooks:
       - id: isort
-        name: isort (python)
\ No newline at end of file
+        name: isort (python)
+        args: ["--profile", "black"]
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 934a143e..2ae657fa 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,4 +7,7 @@
         "source.organizeImports": "explicit"
     },
     "python.analysis.typeCheckingMode": "basic",
+    "isort.args": [
+        "--profile black"
+    ],
 }
\ No newline at end of file