Clean up more warnings

Mostly suppressing old unfixable API issues

Minor type improvements with map copying and tile accessing

Author: HexDecimal

.vscode/settings.json

@@ -20,6 +20,7 @@
         "aarch",
         "ADDA",
         "ADDALPHA",
+        "addoption",
         "addopts",
         "addressof",
         "addsub",
@@ -146,6 +147,7 @@
         "DVLINE",
         "elif",
         "Emscripten",
+        "EMSDK",
         "ENDCALL",
         "endianness",
         "epel",
@@ -207,6 +209,7 @@
         "IJKL",
         "imageio",
         "imread",
+        "includepath",
         "INCOL",
         "INPUTTYPE",
         "INROW",
@@ -308,6 +311,7 @@
         "MMASK",
         "modindex",
         "moduleauthor",
+        "modversion",
         "MOUSEBUTTONDOWN",
         "MOUSEBUTTONUP",
         "MOUSEMOTION",
@@ -328,6 +332,7 @@
         "neww",
         "noarchive",
         "NODISCARD",
+        "NOLONGLONG",
         "NOMESSAGE",
         "Nonrepresentable",
         "NONUSBACKSLASH",
@@ -350,6 +355,7 @@
         "pagerefs",
         "PAGEUP",
         "papersize",
+        "passthru",
         "PATCHLEVEL",
         "pathfinding",
         "pathlib",
@@ -361,6 +367,7 @@
         "PIXELFORMAT",
         "PLUSMINUS",
         "pointsize",
+        "popleft",
         "PRESENTVSYNC",
         "PRINTF",
         "printn",
@@ -378,6 +385,7 @@
         "pypiwin",
         "pypy",
         "pytest",
+        "pytestmark",
         "PYTHONHASHSEED",
         "PYTHONOPTIMIZE",
         "Pyup",
@@ -393,6 +401,7 @@
         "Redistributable",
         "redistributables",
         "repr",
+        "rexpaint",
         "rgba",
         "RGUI",
         "RHYPER",
@@ -447,6 +456,8 @@
         "sphinxstrong",
         "sphinxtitleref",
         "staticmethod",
+        "stdarg",
+        "stddef",
         "stdeb",
         "struct",
         "structs",
@@ -498,6 +509,7 @@
         "VERTICALBAR",
         "vflip",
         "viewcode",
+        "VITAFILE",
         "vline",
         "VOLUMEDOWN",
         "VOLUMEUP",
@@ -508,6 +520,7 @@
         "WAITARROW",
         "WASD",
         "waterlevel",
+        "WINAPI",
         "windowclose",
         "windowenter",
         "WINDOWEVENT",
@@ -526,6 +539,7 @@
         "windowshown",
         "windowsizechanged",
         "windowtakefocus",
+        "xcframework",
         "Xcursor",
         "xdst",
         "Xext",

build_libtcod.py

@@ -11,9 +11,8 @@
 import re
 import subprocess
 import sys
-from collections.abc import Iterable, Iterator
 from pathlib import Path
-from typing import Any, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar, Final
 
 import attrs
 import pycparser  # type: ignore[import-untyped]
@@ -27,6 +26,9 @@
 
 import build_sdl
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator
+
 Py_LIMITED_API = 0x03100000
 
 HEADER_PARSE_PATHS = ("tcod/", "libtcod/src/libtcod/")
@@ -269,7 +271,7 @@ def find_sdl_attrs(prefix: str) -> Iterator[tuple[str, int | str | Any]]:
 
     `prefix` is used to filter out which names to copy.
     """
-    from tcod._libtcod import lib
+    from tcod._libtcod import lib  # noqa: PLC0415
 
     if prefix.startswith("SDL_"):
         name_starts_at = 4
@@ -320,12 +322,14 @@ def parse_sdl_attrs(prefix: str, all_names: list[str] | None) -> tuple[str, str]
 ]
 
 
+RE_CONSTANTS_ALL: Final = re.compile(
+    r"(.*# --- From constants.py ---).*(# --- End constants.py ---.*)",
+    re.DOTALL,
+)
+
+
 def update_module_all(filename: Path, new_all: str) -> None:
     """Update the __all__ of a file with the constants from new_all."""
-    RE_CONSTANTS_ALL = re.compile(
-        r"(.*# --- From constants.py ---).*(# --- End constants.py ---.*)",
-        re.DOTALL,
-    )
     match = RE_CONSTANTS_ALL.match(filename.read_text(encoding="utf-8"))
     assert match, f"Can't determine __all__ subsection in {filename}!"
     header, footer = match.groups()
@@ -346,8 +350,8 @@ def generate_enums(prefix: str) -> Iterator[str]:
 
 def write_library_constants() -> None:
     """Write libtcod constants into the tcod.constants module."""
-    import tcod.color
-    from tcod._libtcod import ffi, lib
+    import tcod.color  # noqa: PLC0415
+    from tcod._libtcod import ffi, lib  # noqa: PLC0415
 
     with Path("tcod/constants.py").open("w", encoding="utf-8") as f:
         all_names = []
@@ -441,6 +445,8 @@ def _fix_reserved_name(name: str) -> str:
 
 @attrs.define(frozen=True)
 class ConvertedParam:
+    """Converted type parameter from C types into Python type-hints."""
+
     name: str = attrs.field(converter=_fix_reserved_name)
     hint: str
     original: str
@@ -460,7 +466,8 @@ def _type_from_names(names: list[str]) -> str:
     return "Any"
 
 
-def _param_as_hint(node: pycparser.c_ast.Node, default_name: str) -> ConvertedParam:
+def _param_as_hint(node: pycparser.c_ast.Node, default_name: str) -> ConvertedParam:  # noqa: PLR0911
+    """Return a Python type-hint from a C AST node."""
     original = pycparser.c_generator.CGenerator().visit(node)
     name: str
     names: list[str]

build_sdl.py

@@ -139,8 +139,8 @@ def check_sdl_version() -> None:
             sdl_version_str = subprocess.check_output(["sdl3-config", "--version"], universal_newlines=True).strip()
         except FileNotFoundError as exc:
             msg = (
-                f"libsdl3-dev or equivalent must be installed on your system and must be at least version {needed_version}."
-                "\nsdl3-config must be on PATH."
+                f"libsdl3-dev or equivalent must be installed on your system and must be at least version {needed_version}.\n"
+                "sdl3-config must be on PATH."
             )
             raise RuntimeError(msg) from exc
     except subprocess.CalledProcessError as exc:
@@ -223,8 +223,8 @@ def on_include_not_found(self, is_malformed: bool, is_system_include: bool, curd
         assert "SDL3/SDL" not in includepath, (includepath, curdir)
         raise pcpp.OutputDirective(pcpp.Action.IgnoreAndRemove)
 
-    def _should_track_define(self, tokens: list[Any]) -> bool:
-        if len(tokens) < 3:
+    def _should_track_define(self, tokens: list[Any]) -> bool:  # noqa: PLR0911
+        if len(tokens) < 3:  # noqa: PLR2004
             return False
         if tokens[0].value in IGNORE_DEFINES:
             return False
@@ -236,7 +236,7 @@ def _should_track_define(self, tokens: list[Any]) -> bool:
             return False  # Likely calls a private function.
         if tokens[1].type == "CPP_LPAREN":
             return False  # Function-like macro.
-        if len(tokens) >= 4 and tokens[2].type == "CPP_INTEGER" and tokens[3].type == "CPP_DOT":
+        if len(tokens) >= 4 and tokens[2].type == "CPP_INTEGER" and tokens[3].type == "CPP_DOT":  # noqa: PLR2004
             return False  # Value is a floating point number.
         if tokens[0].value.startswith("SDL_PR") and (tokens[0].value.endswith("32") or tokens[0].value.endswith("64")):
             return False  # Data type for printing, which is not needed.

examples/cavegen.py

@@ -10,7 +10,7 @@
 from typing import Any
 
 import numpy as np
-import scipy.signal  # type: ignore
+import scipy.signal  # type: ignore[import-untyped]
 from numpy.typing import NDArray
 
 

tcod/color.py

@@ -89,6 +89,8 @@ def __setitem__(self, index: Any, value: Any) -> None:  # noqa: ANN401, D105
         else:
             super().__setitem__(index, value)
 
+    __hash__ = None
+
     def __eq__(self, other: object) -> bool:
         """Compare equality between colors.
 

tcod/console.py

@@ -8,7 +8,6 @@
 from __future__ import annotations
 
 import warnings
-from collections.abc import Iterable
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, overload
 
@@ -22,6 +21,7 @@
 from tcod.cffi import ffi, lib
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
     from os import PathLike
 
     from numpy.typing import ArrayLike, NDArray

tcod/context.py

@@ -29,9 +29,8 @@
 import pickle
 import sys
 import warnings
-from collections.abc import Iterable
 from pathlib import Path
-from typing import Any, Literal, NoReturn, TypeVar
+from typing import TYPE_CHECKING, Any, Literal, NoReturn, TypeVar
 
 from typing_extensions import Self, deprecated
 
@@ -44,6 +43,9 @@
 from tcod._internal import _check, _check_warn
 from tcod.cffi import ffi, lib
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 __all__ = (
     "RENDERER_OPENGL",
     "RENDERER_OPENGL2",

tcod/image.py

@@ -71,7 +71,7 @@ def from_array(cls, array: ArrayLike) -> Image:
         .. versionadded:: 11.4
         """
         array = np.asarray(array, dtype=np.uint8)
-        height, width, depth = array.shape
+        height, width, _depth = array.shape
         image = cls(width, height)
         image_array: NDArray[np.uint8] = np.asarray(image)
         image_array[...] = array