Update pre-commit, fix Ruff and Mypy errors

Author: HexDecimal

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: fix-byte-order-marker
       - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.0
+    rev: v0.11.2
     hooks:
       - id: ruff
         args: [--fix-only, --exit-non-zero-on-fix]

examples/samples_libtcodpy.py

@@ -220,7 +220,7 @@ def render_colors(first, key, mouse):
         SAMPLE_SCREEN_HEIGHT - 1,
         libtcod.BKGND_MULTIPLY,
         libtcod.CENTER,
-        "The Doryen library uses 24 bits " "colors, for both background and " "foreground.",
+        "The Doryen library uses 24 bits colors, for both background and foreground.",
     )
 
     if key.c == ord("f"):
@@ -270,10 +270,7 @@ def render_offscreen(first, key, mouse):
             SAMPLE_SCREEN_HEIGHT // 2,
             libtcod.BKGND_NONE,
             libtcod.CENTER,
-            b"You can render to an offscreen "
-            b"console and blit in on another "
-            b"one, simulating alpha "
-            b"transparency.",
+            b"You can render to an offscreen console and blit in on another one, simulating alpha transparency.",
         )
     if first:
         libtcod.sys_set_fps(30)

examples/samples_tcod.py

@@ -163,7 +163,7 @@ def print_banner(self) -> None:
             y=5,
             width=sample_console.width - 2,
             height=sample_console.height - 1,
-            string="The Doryen library uses 24 bits colors, for both " "background and foreground.",
+            string="The Doryen library uses 24 bits colors, for both background and foreground.",
             fg=WHITE,
             bg=GREY,
             bg_blend=libtcodpy.BKGND_MULTIPLY,
@@ -198,7 +198,7 @@ def __init__(self) -> None:
             2,
             sample_console.width // 2 - 2,
             sample_console.height // 2,
-            "You can render to an offscreen console and blit in on another " "one, simulating alpha transparency.",
+            "You can render to an offscreen console and blit in on another one, simulating alpha transparency.",
             fg=WHITE,
             bg=None,
             alignment=libtcodpy.CENTER,

examples/thread_jobs.py

@@ -77,7 +77,7 @@ def run_test(
     for i in range(1, THREADS + 1):
         executor = concurrent.futures.ThreadPoolExecutor(i)
         multi_time = min(timeit.repeat(lambda: multi_func(executor, maps), number=1, repeat=REPEAT))
-        print(f"{i} threads: {multi_time * 1000:.2f}ms, " f"{single_time / (multi_time * i) * 100:.2f}% efficiency")
+        print(f"{i} threads: {multi_time * 1000:.2f}ms, {single_time / (multi_time * i) * 100:.2f}% efficiency")
 
 
 def main() -> None:
@@ -89,13 +89,10 @@ def main() -> None:
 
     print(f"Python {sys.version}\n{platform.platform()}\n{platform.processor()}")
 
-    print(f"\nComputing field-of-view for " f"{len(maps)} empty {MAP_WIDTH}x{MAP_HEIGHT} maps.")
+    print(f"\nComputing field-of-view for {len(maps)} empty {MAP_WIDTH}x{MAP_HEIGHT} maps.")
     run_test(maps, test_fov_single, test_fov_threads)
 
-    print(
-        f"\nComputing AStar from corner to corner {len(maps)} times "
-        f"on separate empty {MAP_WIDTH}x{MAP_HEIGHT} maps."
-    )
+    print(f"\nComputing AStar from corner to corner {len(maps)} times on separate empty {MAP_WIDTH}x{MAP_HEIGHT} maps.")
     run_test(maps, test_astar_single, test_astar_threads)
 
 

tcod/console.py

@@ -29,15 +29,15 @@ def _fmt(string: str) -> bytes:
 
 _root_console = None
 
-rgba_graphic = np.dtype([("ch", np.intc), ("fg", "4B"), ("bg", "4B")])
+rgba_graphic: np.dtype[Any] = np.dtype([("ch", np.intc), ("fg", "4B"), ("bg", "4B")])
 """A NumPy :any:`dtype` compatible with :any:`Console.rgba`.
 
 This dtype is: ``np.dtype([("ch", np.intc), ("fg", "4B"), ("bg", "4B")])``
 
 .. versionadded:: 12.3
 """
 
-rgb_graphic = np.dtype([("ch", np.intc), ("fg", "3B"), ("bg", "3B")])
+rgb_graphic: np.dtype[Any] = np.dtype([("ch", np.intc), ("fg", "3B"), ("bg", "3B")])
 """A NumPy :any:`dtype` compatible with :any:`Console.rgb`.
 
 This dtype is: ``np.dtype([("ch", np.intc), ("fg", "3B"), ("bg", "3B")])``
@@ -104,7 +104,7 @@ class Console:
     DTYPE = rgba_graphic
 
     # A structured array type with the added "fg_rgb" and "bg_rgb" fields.
-    _DTYPE_RGB = np.dtype(
+    _DTYPE_RGB: np.dtype[Any] = np.dtype(
         {
             "names": ["ch", "fg", "bg"],
             "formats": [np.int32, "3u1", "3u1"],
@@ -955,7 +955,7 @@ def __setstate__(self, state: dict[str, Any]) -> None:
 
     def __repr__(self) -> str:
         """Return a string representation of this console."""
-        return "tcod.console.Console(width=%i, height=%i, " "order=%r,buffer=\n%r)" % (
+        return "tcod.console.Console(width=%i, height=%i, order=%r,buffer=\n%r)" % (
             self.width,
             self.height,
             self._order,

tcod/event.py

@@ -831,7 +831,7 @@ def joystick(self) -> tcod.sdl.joystick.Joystick:
         return tcod.sdl.joystick.Joystick._from_instance_id(self.which)
 
     def __repr__(self) -> str:
-        return f"tcod.event.{self.__class__.__name__}" f"(type={self.type!r}, which={self.which})"
+        return f"tcod.event.{self.__class__.__name__}(type={self.type!r}, which={self.which})"
 
     def __str__(self) -> str:
         prefix = super().__str__().strip("<>")
@@ -934,9 +934,7 @@ def from_sdl_event(cls, sdl_event: Any) -> JoystickHat:
         return cls("JOYHATMOTION", sdl_event.jhat.which, *_HAT_DIRECTIONS[sdl_event.jhat.hat])
 
     def __repr__(self) -> str:
-        return (
-            f"tcod.event.{self.__class__.__name__}" f"(type={self.type!r}, which={self.which}, x={self.x}, y={self.y})"
-        )
+        return f"tcod.event.{self.__class__.__name__}(type={self.type!r}, which={self.which}, x={self.x}, y={self.y})"
 
     def __str__(self) -> str:
         prefix = super().__str__().strip("<>")
@@ -977,7 +975,7 @@ def from_sdl_event(cls, sdl_event: Any) -> JoystickButton:
         return cls(type, sdl_event.jbutton.which, sdl_event.jbutton.button)
 
     def __repr__(self) -> str:
-        return f"tcod.event.{self.__class__.__name__}" f"(type={self.type!r}, which={self.which}, button={self.button})"
+        return f"tcod.event.{self.__class__.__name__}(type={self.type!r}, which={self.which}, button={self.button})"
 
     def __str__(self) -> str:
         prefix = super().__str__().strip("<>")
@@ -1032,7 +1030,7 @@ def controller(self) -> tcod.sdl.joystick.GameController:
         return tcod.sdl.joystick.GameController._from_instance_id(self.which)
 
     def __repr__(self) -> str:
-        return f"tcod.event.{self.__class__.__name__}" f"(type={self.type!r}, which={self.which})"
+        return f"tcod.event.{self.__class__.__name__}(type={self.type!r}, which={self.which})"
 
     def __str__(self) -> str:
         prefix = super().__str__().strip("<>")

tcod/libtcodpy.py

@@ -697,7 +697,7 @@ def bsp_traverse_level_order(
     _bsp_traverse(node.level_order(), callback, userData)
 
 
-@deprecate("Iterate over nodes using " "'for n in node.inverted_level_order():' instead.")
+@deprecate("Iterate over nodes using 'for n in node.inverted_level_order():' instead.")
 def bsp_traverse_inverted_level_order(
     node: tcod.bsp.BSP,
     callback: Callable[[tcod.bsp.BSP, Any], None],
@@ -1863,7 +1863,7 @@ def console_delete(con: tcod.console.Console) -> None:
         )
     else:
         warnings.warn(
-            "You no longer need to make this call, " "Console's are deleted when they go out of scope.",
+            "You no longer need to make this call, Console's are deleted when they go out of scope.",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -2398,7 +2398,7 @@ def heightmap_set_value(hm: NDArray[np.float32], x: int, y: int, value: float) -
     """
     if hm.flags["C_CONTIGUOUS"]:
         warnings.warn(
-            "Assign to this heightmap with hm[i,j] = value\n" "consider using order='F'",
+            "Assign to this heightmap with hm[i,j] = value\nconsider using order='F'",
             DeprecationWarning,
             stacklevel=2,
         )
@@ -2847,7 +2847,7 @@ def heightmap_get_value(hm: NDArray[np.float32], x: int, y: int) -> float:
     """
     if hm.flags["C_CONTIGUOUS"]:
         warnings.warn(
-            "Get a value from this heightmap with hm[i,j]\n" "consider using order='F'",
+            "Get a value from this heightmap with hm[i,j]\nconsider using order='F'",
             DeprecationWarning,
             stacklevel=2,
         )

tcod/noise.py

@@ -91,7 +91,7 @@ def __repr__(self) -> str:
 def __getattr__(name: str) -> Implementation:
     if name in Implementation.__members__:
         warnings.warn(
-            f"'tcod.noise.{name}' is deprecated," f" use 'tcod.noise.Implementation.{name}' instead.",
+            f"'tcod.noise.{name}' is deprecated, use 'tcod.noise.Implementation.{name}' instead.",
             FutureWarning,
             stacklevel=2,
         )

tcod/path.py

@@ -171,7 +171,7 @@ def __init__(self, cost: Any, diagonal: float = 1.41) -> None:
 
         if not hasattr(self.cost, "get_tcod_path_ffi"):
             assert not callable(self.cost), (
-                "Any callback alone is missing shape information. " "Wrap your callback in tcod.path.EdgeCostCallback"
+                "Any callback alone is missing shape information. Wrap your callback in tcod.path.EdgeCostCallback"
             )
             self.cost = NodeCostArray(self.cost)
 

tests/test_console.py

@@ -112,7 +112,7 @@ def test_console_str() -> None:
     console.ch[:] = ord(".")
     with pytest.warns():
         console.print_(0, 0, "Test")
-    assert str(console) == ("<Test......\n" " ..........>")
+    assert str(console) == ("<Test......\n ..........>")
 
 
 def test_console_fortran_buffer() -> None: