fixup! fixup! fixup! fixup! fixup! squash! fixup! Fix CI regressions

Author: HexDecimal

.github/workflows/python-package.yml

@@ -265,6 +265,10 @@ jobs:
                 systemd-devel mesa-libGL-devel libxkbcommon-devel mesa-libGLES-devel \
                 mesa-libEGL-devel vulkan-devel wayland-devel wayland-protocols-devel \
                 libdrm-devel mesa-libgbm-devel libusb-devel
+            git clone https://github.com/libsdl-org/SDL.git sdl_repo
+            cmake -S sdl_repo -B sdl_build
+            cmake --build sdl_build --config Release
+            cmake --install sdl_build --config Release
           CIBW_BEFORE_TEST: pip install numpy
           CIBW_TEST_COMMAND: python -c "import tcod.context"
           # Skip test on emulated architectures

build_libtcod.py

@@ -211,7 +211,12 @@ def walk_sources(directory: str) -> Iterator[str]:
 
 ffi = FFI()
 sdl_cdef, sdl_strings = build_sdl.get_cdef()
-ffi.cdef(sdl_cdef)
+try:
+    ffi.cdef(sdl_cdef)
+except Exception as exc:
+    if sys.version_info >= (3, 11):
+        exc.add_note(f"Processed cdef is as follows:\n{sdl_cdef}")
+    raise
 for include in includes:
     try:
         ffi.cdef(include.header)

build_sdl.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import io
+import logging
 import os
 import platform
 import re
@@ -21,6 +22,12 @@
 # This script calls a lot of programs.
 # ruff: noqa: S603, S607, T201
 
+# Ignore f-strings in logging, these will eventually be replaced with t-strings.
+# ruff: noqa: G004
+
+logger = logging.getLogger(__name__)
+
+
 BIT_SIZE, LINKAGE = platform.architecture()
 
 # Reject versions of SDL older than this, update the requirements in the readme if you change this.
@@ -133,7 +140,7 @@ def check_sdl_version() -> None:
             f" {needed_version}.\nsdl3-config must be on PATH."
         )
         raise RuntimeError(msg) from exc
-    print(f"Found SDL {sdl_version_str}.")
+    logger.info(f"Found SDL {sdl_version_str}.")
     sdl_version = tuple(int(s) for s in sdl_version_str.split("."))
     if sdl_version < SDL_MIN_VERSION:
         msg = f"SDL version must be at least {needed_version}, (found {sdl_version_str})"
@@ -150,7 +157,7 @@ def get_sdl_file(version: str) -> Path:
     sdl_local_file = Path("dependencies", sdl_archive)
     sdl_remote_url = f"https://www.libsdl.org/release/{sdl_archive}"
     if not sdl_local_file.exists():
-        print(f"Downloading {sdl_remote_url}")
+        logger.info(f"Downloading {sdl_remote_url}")
         Path("dependencies/").mkdir(parents=True, exist_ok=True)
         with requests.get(sdl_remote_url) as response:  # noqa: S113
             response.raise_for_status()
@@ -167,7 +174,7 @@ def unpack_sdl(version: str) -> Path:
     if sdl_path.exists():
         return sdl_path
     sdl_archive = get_sdl_file(version)
-    print(f"Extracting {sdl_archive}")
+    logger.info(f"Extracting {sdl_archive}")
     if sdl_archive.suffix == ".zip":
         with zipfile.ZipFile(sdl_archive) as zf:
             zf.extractall("dependencies/")