Use ruff

.pre-commit-config.yaml

@@ -10,21 +10,10 @@ repos:
       - id: requirements-txt-fixer
       - id: end-of-file-fixer
       - id: trailing-whitespace
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        name: Format imports
-        args: ["--profile", "black"]
-
-  - repo: https://github.com/psf/black
-    rev: 24.10.0
-    hooks:
-      - id: black
-        name: Format code
-
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.7.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.4
     hooks:
       - id: ruff
+        args: ["--select", "E,F,I,UP,W", "--ignore", "E501", "--fix"]
+      - id: ruff-format
+        args: ["--line-length", "119"]

.vscode/settings.json

@@ -2,20 +2,14 @@
     "editor.formatOnSave": true,
     "files.insertFinalNewline": false,
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnType": true,
         "editor.codeActionsOnSave": {
+            "source.fixAll.ruff": "explicit",
             "source.organizeImports": "explicit"
         }
     },
-    "black-formatter.args": [
-        "--line-length=119"
-    ],
-    "isort.args": ["--profile", "black"],
     "flake8.args": [
         "--max-line-length=119"
     ],
-    "ruff.lint.args": [
-        "--line-length=119"
-    ]
 }

pyproject.toml

@@ -15,15 +15,27 @@ dependencies = [
 ]
 
 [tool.ruff]
-# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
-select = ["E", "F"]
-ignore = ["E501"] # line too long (black is taking care of this)
 line-length = 119
-fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
 
-[tool.isort]
-profile = "black"
-line_length = 119
+[tool.ruff.lint]
+select = [
+    "ARG",  # Check function argument usage
+    "B",    # Common bugs and design problems (from flake8-bugbear)
+    "C",    # Complexity checks (from mccabe)
+    "E",    # PEP 8 errors (from pycodestyle)
+    "F",    # Pyflakes errors (basic Python errors)
+    "I",    # Import sorting and formatting
+    "N",    # Naming conventions (from pep8-naming)
+    "PL",   # Pylint rules
+    "S101", # Use of assert statements (from flake8-bandit)
+    "SIM",  # Code simplification suggestions
+    "UP",   # Python upgrade suggestions
+    "W",    # PEP 8 warnings (from pycodestyle)
+]
+ignore = [
+    "E501",   # Line too long (> 79 characters)
+    "SIM117", # Use a single 'with' statement with multiple contexts instead of nested 'with' statements
+]
 
-[tool.black]
-line-length = 119
+[tool.ruff.format]
+docstring-code-format = true

src/populate.py

@@ -75,7 +75,8 @@ def get_evaluation_queue_df(save_path: str, cols: list[str]) -> list[pd.DataFram
 
             # data[EvalQueueColumn.model.name] = make_clickable_model(data["model"])
             data[EvalQueueColumn.model.name] = make_clickable_model_with_shot(
-                data["model"], data["num_few_shot"]  # num_few_shotは必ず存在するため、直接参照
+                data["model"],
+                data["num_few_shot"],  # num_few_shotは必ず存在するため、直接参照
             )
             data[EvalQueueColumn.revision.name] = data.get("revision", "main")