Add ARM64 Windows wheels to be tested and published

Update Windows platform detection,
unsure if this is actually better in any way.

This architecture may become more common in the future,
I'd rather support it now just in case.

Author: HexDecimal

.github/workflows/python-package.yml

@@ -118,6 +118,9 @@ jobs:
           - os: "windows-latest"
             python-version: "3.10"
             architecture: "x86"
+          - os: "windows-11-arm"
+            python-version: "3.11"
+            architecture: "arm64"
       fail-fast: false
 
     steps:

build_sdl.py

@@ -3,10 +3,10 @@
 
 from __future__ import annotations
 
+import functools
 import io
 import logging
 import os
-import platform
 import re
 import shutil
 import subprocess
@@ -28,7 +28,20 @@
 logger = logging.getLogger(__name__)
 
 
-BIT_SIZE, LINKAGE = platform.architecture()
+RE_MACHINE = re.compile(r".*\((.+)\)\]", re.DOTALL)
+
+
+@functools.cache
+def python_machine() -> str:
+    """Return the Python machine architecture (e.g. 'i386', 'AMD64', 'ARM64')."""
+    # Only needs to function correctly for Windows platforms.
+    match = RE_MACHINE.match(sys.version)
+    assert match, repr(sys.version)
+    (machine,) = match.groups()
+    machine = {"Intel": "i386"}.get(machine, machine)
+    logger.info(f"python_machine: {machine}")
+    return machine
+
 
 # Reject versions of SDL older than this, update the requirements in the readme if you change this.
 SDL_MIN_VERSION = (3, 2, 0)
@@ -386,10 +399,10 @@ def get_cdef() -> tuple[str, dict[str, str]]:
 # Bundle the Windows SDL DLL.
 if sys.platform == "win32" and SDL_BUNDLE_PATH is not None:
     include_dirs.append(str(SDL_INCLUDE))
-    ARCH_MAPPING = {"32bit": "x86", "64bit": "x64"}
-    SDL_LIB_DIR = Path(SDL_BUNDLE_PATH, "lib/", ARCH_MAPPING[BIT_SIZE])
+    ARCH_MAPPING = {"i386": "x86", "AMD64": "x64", "ARM64": "arm64"}
+    SDL_LIB_DIR = Path(SDL_BUNDLE_PATH, "lib/", ARCH_MAPPING[python_machine()])
     library_dirs.append(str(SDL_LIB_DIR))
-    SDL_LIB_DEST = Path("tcod", ARCH_MAPPING[BIT_SIZE])
+    SDL_LIB_DEST = Path("tcod", ARCH_MAPPING[python_machine()])
     SDL_LIB_DEST.mkdir(exist_ok=True)
     SDL_LIB_DEST_FILE = SDL_LIB_DEST / "SDL3.dll"
     SDL_LIB_FILE = SDL_LIB_DIR / "SDL3.dll"

setup.py

@@ -3,7 +3,6 @@
 
 from __future__ import annotations
 
-import platform
 import sys
 from pathlib import Path
 
@@ -18,18 +17,19 @@
 
 def get_package_data() -> list[str]:
     """Get data files which will be included in the main tcod/ directory."""
-    bit_size, _ = platform.architecture()
     files = [
         "py.typed",
         "lib/LIBTCOD-CREDITS.txt",
         "lib/LIBTCOD-LICENSE.txt",
         "lib/README-SDL.txt",
     ]
-    if "win32" in sys.platform:
-        if bit_size == "32bit":
-            files += ["x86/SDL3.dll"]
-        else:
+    if sys.platform == "win32":
+        if "ARM64" in sys.version:
+            files += ["arm64/SDL3.dll"]
+        elif "AMD64" in sys.version:
             files += ["x64/SDL3.dll"]
+        else:
+            files += ["x86/SDL3.dll"]
     if sys.platform == "darwin":
         files += ["SDL3.framework/Versions/A/SDL3"]
     return files