Update linters and config

HexDecimal · HexDecimal · commit 411a9d3a326b · 2024-09-23T20:21:59.000-07:00
Switch Ruff to ALL by default
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+ci:
+  autoupdate_schedule: quarterly
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
@@ -15,7 +17,7 @@ repos:
       - id: fix-byte-order-marker
       - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.10
+    rev: v0.6.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "Python: Module",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "main",
             "justMyCode": true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,7 @@
         "editor.defaultFormatter": "charliermarsh.ruff"
     },
     "cSpell.words": [
+        "autoupdate",
         "blit",
         "isort",
         "PAGEDOWN",
diff --git a/game/constants.py b/game/constants.py
@@ -1,5 +1,7 @@
 """Global constants are stored here."""
 
+from __future__ import annotations
+
 from typing import Final
 
 from tcod.event import KeySym
diff --git a/game/menus.py b/game/menus.py
@@ -23,7 +23,7 @@ class MenuItem(Protocol):
     def on_event(self, event: tcod.event.Event) -> StateResult:
         """Handle events passed to the menu item."""
 
-    def on_draw(self, console: tcod.console.Console, x: int, y: int, highlight: bool) -> None:
+    def on_draw(self, console: tcod.console.Console, x: int, y: int, *, highlight: bool) -> None:
         """Draw is item at the given position."""
 
 
@@ -44,7 +44,7 @@ def on_event(self, event: tcod.event.Event) -> StateResult:
             case _:
                 return None
 
-    def on_draw(self, console: tcod.console.Console, x: int, y: int, highlight: bool) -> None:
+    def on_draw(self, console: tcod.console.Console, x: int, y: int, *, highlight: bool) -> None:
         """Render this items label."""
         console.print(x, y, self.label, fg=(255, 255, 255), bg=(64, 64, 64) if highlight else (0, 0, 0))
 
@@ -62,7 +62,7 @@ def on_event(self, event: tcod.event.Event) -> StateResult:
         """Handle events for menus."""
         match event:
             case tcod.event.Quit():
-                raise SystemExit()
+                raise SystemExit
             case tcod.event.KeyDown(sym=sym) if sym in DIRECTION_KEYS:
                 dx, dy = DIRECTION_KEYS[sym]
                 if dx != 0 or dy == 0:
diff --git a/game/state_tools.py b/game/state_tools.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import tcod.console
+import tcod.event
 
 import g
 from game.state import Pop, Push, Reset, State, StateResult
@@ -50,7 +51,7 @@ def get_previous_state(state: State) -> State | None:
     return g.states[current_index - 1] if current_index > 0 else None
 
 
-def draw_previous_state(state: State, console: tcod.console.Console, dim: bool = True) -> None:
+def draw_previous_state(state: State, console: tcod.console.Console, *, dim: bool = True) -> None:
     """Draw previous states, optionally dimming all but the active state."""
     prev_state = get_previous_state(state)
     if prev_state is None:
diff --git a/game/states.py b/game/states.py
@@ -26,7 +26,7 @@ def on_event(self, event: tcod.event.Event) -> StateResult:
         (player,) = g.world.Q.all_of(tags=[IsPlayer])
         match event:
             case tcod.event.Quit():
-                raise SystemExit()
+                raise SystemExit
             case tcod.event.KeyDown(sym=sym) if sym in DIRECTION_KEYS:
                 player.components[Position] += DIRECTION_KEYS[sym]
                 # Auto pickup gold
@@ -89,4 +89,4 @@ def new_game() -> StateResult:
     @staticmethod
     def quit() -> StateResult:
         """Close the program."""
-        raise SystemExit()
+        raise SystemExit
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,42 +22,24 @@ line-length = 120
 target-version = "py311"
 
 [tool.ruff.lint]
-select = [
-    "C90", # mccabe
-    "D",   # pydocstyle
-    "E",   # pycodestyle
-    "W",   # pycodestyle
-    "F",   # Pyflakes
-    "I",   # isort
-    "UP",  # pyupgrade
-    "YTT", # flake8-2020
-    "ANN", # flake8-annotations
-    "S",   # flake8-bandit
-    "B",   # flake8-bugbear
-    "C4",  # flake8-comprehensions
-    "DTZ", # flake8-datetimez
-    "EM",  # flake8-errmsg
-    "EXE", # flake8-executable
-    "FA",  # flake8-future-annotations
-    "RET", # flake8-return
-    "ICN", # flake8-import-conventions
-    "PIE", # flake8-pie
-    "PT",  # flake8-pytest-style
-    "SIM", # flake8-simplify
-    "PTH", # flake8-use-pathlib
-    "PL",  # Pylint
-    "TRY", # tryceratops
-    "RUF", # NumPy-specific rules
-    "G",   # flake8-logging-format
-]
+select = ["ALL"]
 ignore = [
-    "E501",    # line-too-long
-    "S101",    # assert
     "ANN101",  # missing-type-self
     "ANN102",  # missing-type-cls
-    "S311",    # suspicious-non-cryptographic-random-usage
+    "COM",     # flake8-commas
+    "E501",    # line-too-long
+    "ISC001",  # single-line-implicit-string-concatenation
     "PLR0913", # too-many-arguments
+    "S101",    # assert
+    "S311",    # suspicious-non-cryptographic-random-usage
+    "T20",     # flake8-print
+    "TCH001",  # typing-only-first-party-import
+    "TCH002",  # typing-only-third-party-import
+    "TCH003",  # typing-only-standard-library-import
 ]
 
+[tool.ruff.lint.isort]
+required-imports = ["from __future__ import annotations"]
+
 [tool.ruff.lint.pydocstyle] # https://docs.astral.sh/ruff/settings/#lintpydocstyle
 convention = "google"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"configurations": [`
`7`	`7`	`{`
`8`	`8`	`"name": "Python: Module",`
`9`		`- "type": "python",`
	`9`	`+ "type": "debugpy",`
`10`	`10`	`"request": "launch",`
`11`	`11`	`"module": "main",`
`12`	`12`	`"justMyCode": true`