Bump min python to 3.10

Author: burner1024

action/check-encoding.py

@@ -90,7 +90,9 @@ def main() -> int:
         if iconv_ok(batch, encoding):
             continue
         # The group failed somewhere; find the offending files.
-        bad.extend(path for (path, _), blob in zip(items, split_blobs(batch)) if not iconv_ok(blob, encoding))
+        bad.extend(
+            path for (path, _), blob in zip(items, split_blobs(batch), strict=True) if not iconv_ok(blob, encoding)
+        )
 
     if bad:
         print("::error::Files with a working-tree-encoding attribute are not stored as UTF-8 in Git.")

docs/changelog.md

@@ -3,6 +3,7 @@
 ### WIP
 
 - Action: now fails the run if any file with a `working-tree-encoding` gitattribute is not stored as UTF-8 in Git. Files uploaded through the GitHub web UI or contents API bypass Git's encoding filter and commit raw legacy bytes, which Git silently flags as `failed to encode` on checkout without failing the build. The check surfaces the affected files so they can be re-committed correctly.
+- Dropped support for Python 3.9 (end of life). The minimum supported version is now Python 3.10.
 
 ### 1.5.3
 

msg2po/dir2msgstr.py

@@ -5,7 +5,6 @@
 import argparse
 import os
 import sys
-from typing import Optional
 
 from loguru import logger
 from polib import POFile, pofile
@@ -29,7 +28,7 @@ def dir2msgstr(
     overwrite: bool = True,
     extension: str = "",
     same: bool = False,
-    indexed_po: Optional[IndexedPO] = None,
+    indexed_po: IndexedPO | None = None,
 ):
     """Loads translated strings from files in src_dir into po, mutating it in place."""
     logger.debug(f"overwrite is {overwrite}")

msg2po/transfile.py

@@ -5,7 +5,6 @@
 import re
 import unicodedata
 from dataclasses import dataclass
-from typing import Optional
 
 from loguru import logger
 
@@ -20,9 +19,9 @@
 class TRANSEntry:
     index: str
     value: str
-    context: Optional[str] = None
-    female: Optional[str] = None
-    comment: Optional[str] = None
+    context: str | None = None
+    female: str | None = None
+    comment: str | None = None
 
 
 def _load_lines(filepath: str, pattern: str, dotall: bool, encoding: str) -> list[tuple[str, ...]]:
@@ -41,7 +40,7 @@ def _load_lines(filepath: str, pattern: str, dotall: bool, encoding: str) -> lis
     return re.findall(pattern, text)
 
 
-def _load_female_lines(filepath: str, fformat: FileFormat, encoding: str) -> Optional[list[tuple[str, ...]]]:
+def _load_female_lines(filepath: str, fformat: FileFormat, encoding: str) -> list[tuple[str, ...]] | None:
     """Load separate female file lines if the format uses separate female files.
     Returns None if no female file exists or format uses inline female."""
     if fformat["line_format"]["female"] != "separate":
@@ -64,8 +63,8 @@ def _parse_entries(
     fext: str,
     filepath: str,
     is_source: bool,
-    comment: Optional[str],
-    female_lines: Optional[list[tuple[str, ...]]],
+    comment: str | None,
+    female_lines: list[tuple[str, ...]] | None,
 ) -> list[TRANSEntry]:
     """Parse regex-matched lines into TRANSEntry objects.
     Validates forbidden characters, duplicate indices, and '000' index."""
@@ -93,14 +92,14 @@ def _parse_entries(
             entry_comment = EMPTY_COMMENT
 
         # context
-        context: Optional[str] = None
+        context: str | None = None
         if "context" in fformat:
             context = line[fformat["context"]]
         if context == "":
             context = None
 
         # inline female (format has female index in regex, e.g. TRA)
-        female: Optional[str] = None
+        female: str | None = None
         if "female" in fformat:
             female = str(line[fformat["female"]])
             if female == "":
@@ -135,7 +134,7 @@ class TRANSFile:
     This is because PO gettext format doesn't tolerate empty msgids.
     """
 
-    def __init__(self, filepath: str, is_source: bool = False, encoding: Optional[str] = None):
+    def __init__(self, filepath: str, is_source: bool = False, encoding: str | None = None):
         if encoding is None:
             encoding = CONFIG.encoding
         self.encoding = encoding
@@ -159,7 +158,7 @@ def __init__(self, filepath: str, is_source: bool = False, encoding: Optional[st
         )
 
 
-def is_indexed(txt_filename: str, encoding: Optional[str] = None) -> bool:
+def is_indexed(txt_filename: str, encoding: str | None = None) -> bool:
     """Check if a TXT file is fully indexed (all non-empty lines match index:value pattern)."""
     if encoding is None:
         encoding = CONFIG.encoding

pyproject.toml

@@ -5,7 +5,7 @@ description = "A set of helper tools to convert Fallout 1/2 MSG and WeiDU TRA in
 authors = [{ name = "BGforge", email = "dev@bgforge.net" }]
 keywords = ["Fallout", "Fallout 2", "Baldur's Gate", "Infinity Engine", "WeiDU"]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "natsort>=8.4",
     "polib>=1.1.1",
@@ -32,7 +32,7 @@ Repository = "https://github.com/BGforgeNet/msg2po"
 
 [dependency-groups]
 dev = [
-    "pytest>=7.4,<9",
+    "pytest>=9.0.3,<10",
     "ruff>=0.15",
     "ty>=0.0.1a8",
     "vulture>=2.14",