From f3ba502133b22d8d8a246c8f6211e18011f81bfc Mon Sep 17 00:00:00 2001
From: Aakash Singh <mail@singhaakash.dev>
Date: Fri, 1 Sep 2023 15:20:03 +0530
Subject: [PATCH] bring black back

---
 .github/workflows/linter.yml | 2 ++
 .pre-commit-config.yaml      | 6 ++++++
 .vscode/extensions.json      | 2 ++
 .vscode/settings.json        | 4 +++-
 requirements/local.txt       | 1 +
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index b51441148b..976263193b 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -23,6 +23,8 @@ jobs:
                 echo "changed_files=$(git diff --name-only --diff-filter=ACMR ${{ github.event.before }} ${{ github.event.after }} | grep -E '\.py$|\/pyproject.toml$' | xargs)" >> $GITHUB_OUTPUT
             fi
 
+      - uses: psf/black@stable
+
       - uses: chartboost/ruff-action@v1
         if: steps.changed-files.outputs.changed_files != ''
         with:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 32405bb614..77a2f18433 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,6 +16,12 @@ repos:
       - id: check-yaml
       - id: check-toml
 
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+      - id: black
+        args: ["--config=pyproject.toml"]
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.0.285
     hooks:
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6225558c19..e9d06bb780 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,8 @@
 {
   "recommendations": [
     "boto3typed.boto3-ide",
+    "ms-python.python",
+    "ms-python.vscode-pylance",
     "charliermarsh.ruff"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 14eabb433d..9fc4c5b3ae 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,7 @@
     "editor.formatOnSave": false
   },
   "[python]": {
-    "editor.defaultFormatter": null,
+    "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
       "source.fixAll": true
     }
@@ -20,4 +20,6 @@
   "files.trimTrailingWhitespace": true,
   "githubPullRequests.ignoredPullRequestBranches": ["master"],
   "python.languageServer": "Pylance",
+  "python.formatting.blackPath": "${workspaceFolder}/.venv/bin/black",
+  "python.formatting.provider": "black",
 }
diff --git a/requirements/local.txt b/requirements/local.txt
index 9b630d7188..3535777917 100644
--- a/requirements/local.txt
+++ b/requirements/local.txt
@@ -10,6 +10,7 @@ django-silk==5.0.3  # https://github.com/jazzband/django-silk/blob/master/CHANGE
 
 # Code quality
 # ------------------------------------------------------------------------------
+black==23.3.0  # https://github.com/psf/black/blob/main/CHANGES.md
 ruff==0.0.285  # https://github.com/astral-sh/ruff/releases
 pre-commit==3.3.2  # https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md