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

for more information, see https://pre-commit.ci
ComPWA · Jan 1, 2024 · 142f5b3 · 142f5b3
1 parent 6e273dc
commit 142f5b3
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 51 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,6 +2,7 @@ ci:
   autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks"
   autoupdate_schedule: quarterly
   skip:
+    - prettier
     - pyright
     - taplo
 
@@ -11,6 +12,17 @@ repos:
       - id: check-hooks-apply
       - id: check-useless-excludes
 
+  - repo: https://github.com/ComPWA/repo-maintenance
+    rev: 0.1.11
+    hooks:
+      - id: check-dev-files
+        args:
+          - --no-gitpod
+          - --no-prettierrc
+          - --no-pypi
+          - --repo-name=ComPWA benchmarks
+          - --repo-title=benchmarks
+      - id: colab-toc-visible
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
@@ -26,29 +38,8 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
 
-  - repo: https://github.com/ComPWA/repo-maintenance
-    rev: 0.1.11
-    hooks:
-      - id: check-dev-files
-        args:
-          - --no-gitpod
-          - --no-prettierrc
-          - --no-pypi
-          - --repo-name=ComPWA benchmarks
-          - --repo-title=benchmarks
-      - id: colab-toc-visible
-  - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.7.1
-    hooks:
-      - id: nbqa-pyupgrade
-        args:
-          - --py37-plus
-      - id: nbqa-ruff
-        args:
-          - --fix
-
-  - repo: https://github.com/psf/black
-    rev: 23.12.1
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: PLEASE-UPDATE
     hooks:
       - id: black
       - id: black-jupyter
@@ -101,19 +92,12 @@ repos:
     hooks:
       - id: pyright
 
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
-    hooks:
-      - id: pyupgrade
-        args:
-          - --py37-plus
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.9
     hooks:
       - id: ruff
-        args:
-          - --fix
+        args: [--fix]
+        types_or: [python, pyi, jupyter]
 
   - repo: https://github.com/ComPWA/mirrors-taplo
     rev: v0.8.1

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,7 +18,7 @@
   },
   "[python]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     },
     "editor.defaultFormatter": "ms-python.black-formatter",
     "editor.rulers": [88]
@@ -27,13 +27,15 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "black-formatter.importStrategy": "fromEnvironment",
+  "diffEditor.experimental.showMoves": true,
   "editor.formatOnSave": true,
   "files.associations": {
     ".cspell/*.txt": "plaintext"
   },
   "files.eol": "\n",
   "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"],
   "livePreview.defaultPreviewPath": "docs/_build/html",
+  "multiDiffEditor.experimental.enabled": true,
   "notebook.gotoSymbols.showAllSymbols": true,
   "python.analysis.autoImportCompletions": false,
   "rewrap.wrappingColumn": 88,

diff --git a/environment.yml b/environment.yml
@@ -6,3 +6,5 @@ dependencies:
   - pip
   - pip:
       - -e .[dev]
+variables:
+  PRETTIER_LEGACY_CLI: "1"
diff --git a/pyproject.toml b/pyproject.toml
@@ -55,8 +55,15 @@ format = [
     "black",
 ]
 jupyter = [
+    "isort",
+    "jupyterlab",
     "jupyterlab >=3.0",
     "jupyterlab-code-formatter",
+    "jupyterlab-git",
+    "jupyterlab-lsp",
+    "jupyterlab-myst",
+    "python-lsp-ruff",
+    "python-lsp-server[rope]",
     'jupyterlab-myst; python_version >="3.7.0"',
 ]
 lint = [
@@ -99,24 +106,6 @@ target-version = [
     "py39",
 ]
 
-[tool.nbqa.addopts]
-ruff = [
-    "--extend-ignore=B018",
-    "--extend-ignore=C408",
-    "--extend-ignore=C90",
-    "--extend-ignore=D",
-    "--extend-ignore=N806",
-    "--extend-ignore=N816",
-    "--extend-ignore=PLR09",
-    "--extend-ignore=PLR2004",
-    "--extend-ignore=PLW0602",
-    "--extend-ignore=PLW0603",
-    "--line-length=85",
-]
-
-[tool.nbqa.exclude]
-flake8 = "^docs/appendix/benchmark.ipynb"
-
 [tool.pyright]
 reportGeneralTypeIssues = false
 reportImportCycles = false
@@ -163,6 +152,7 @@ testpaths = [
 ]
 
 [tool.ruff]
+extend-include = ["*.ipynb"]
 extend-select = [
     "A",
     "B",
@@ -213,6 +203,23 @@ target-version = "py37"
 task-tags = ["cspell"]
 
 [tool.ruff.per-file-ignores]
+"*.ipynb" = [
+    "B018",
+    "C408",
+    "C90",
+    "D",
+    "E402",
+    "E703",
+    "N806",
+    "N816",
+    "PLR09",
+    "PLR2004",
+    "PLW0602",
+    "PLW0603",
+    "S101",
+    "T20",
+    "TCH00",
+]
 "docs/*" = [
     "E402",
     "INP001",

diff --git a/scripts/execute_jax_benchmark.py b/scripts/execute_jax_benchmark.py
@@ -1,4 +1,5 @@
 """Execute JAX over a combination of physical cores."""
+
 from __future__ import annotations
 
 import logging

diff --git a/scripts/visualize_jax_benchmark.py b/scripts/visualize_jax_benchmark.py
@@ -1,4 +1,5 @@
 """Visualize benchmark results from :file:`execute_jax_benchmark.py`."""
+
 from __future__ import annotations
 
 import logging