[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
ComPWA · Oct 3, 2023 · 9ba3e89 · 9ba3e89
1 parent f6c3420
commit 9ba3e89
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 75 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -41,9 +41,6 @@ repos:
   - repo: https://github.com/nbQA-dev/nbQA
     rev: 1.7.0
     hooks:
-      - id: nbqa-black
-        additional_dependencies:
-          - black>=22.1.0
       - id: nbqa-pyupgrade
         args:
           - --py37-plus
@@ -55,6 +52,11 @@ repos:
     rev: 23.9.1
     hooks:
       - id: black
+      - id: black-jupyter
+        args:
+          - --line-length=85
+        types_or:
+          - jupyter
 
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
     rev: 2.7.2
@@ -77,6 +79,7 @@ repos:
             cell.attachments
             cell.metadata.code_folding
             cell.metadata.id
+            cell.metadata.pycharm
             cell.metadata.user_expressions
             metadata.celltoolbar
             metadata.colab.name

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -7,6 +7,7 @@
     "garaioag.garaio-vscode-unwanted-recommendations",
     "github.vscode-github-actions",
     "github.vscode-pull-request-github",
+    "ms-python.black-formatter",
     "ms-python.python",
     "ms-python.vscode-pylance",
     "ms-vscode.live-server",
@@ -20,6 +21,7 @@
   ],
   "unwantedRecommendations": [
     "bungcip.better-toml",
+    "davidanson.vscode-markdownlint",
     "ms-python.flake8",
     "ms-python.isort",
     "ms-python.mypy-type-checker",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -16,11 +16,13 @@
   "[python]": {
     "editor.codeActionsOnSave": {
       "source.organizeImports": true
-    }
+    },
+    "editor.defaultFormatter": "ms-python.black-formatter"
   },
   "[yaml]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "black-formatter.importStrategy": "fromEnvironment",
   "cSpell.enabled": true,
   "editor.formatOnSave": true,
   "editor.rulers": [88],
@@ -31,11 +33,6 @@
   "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"],
   "livePreview.defaultPreviewPath": "docs/_build/html",
   "python.analysis.autoImportCompletions": false,
-  "python.formatting.provider": "black",
-  "python.linting.enabled": true,
-  "python.linting.flake8Enabled": false,
-  "python.linting.pydocstyleEnabled": false,
-  "python.linting.pylintEnabled": false,
   "rewrap.wrappingColumn": 88,
   "ruff.enable": true,
   "ruff.organizeImports": true

diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,6 @@ target-version = [
 ]
 
 [tool.nbqa.addopts]
-black = ["--line-length=85"]
 ruff = [
     "--extend-ignore=B018",
     "--extend-ignore=C408",