Python 3.15 (Faster startup with auto-lazy imports)

.dprint.jsonc

@@ -1,5 +1,6 @@
+// https://dprint.dev/config/#extending-a-different-configuration-file
 {
-  // https://dprint.dev/config/#extending-a-different-configuration-file
+  // https://github.com/BesLogic/shared-configs/blob/main/.dprint.jsonc
   "extends": "https://raw.githubusercontent.com/BesLogic/shared-configs/main/.dprint.jsonc",
   // Trying to match dprint to QT designer output, but whitespace sensitivity still not fully respected
   // "markup": {

.github/workflows/lint-and-build.yml

@@ -48,7 +48,7 @@ defaults:
 
 jobs:
   PySentry:
-    runs-on: ubuntu-24.04-arm
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
       - uses: astral-sh/setup-uv@v7
@@ -66,7 +66,7 @@ jobs:
       - id: set
         # Only the Python version(s) we plan on shipping matter.
         run: |
-          $pythonVersions = @('3.14')
+          $pythonVersions = @('3.14', '3.15')
           "python-versions=$($pythonVersions | ConvertTo-Json -Compress -AsArray)" >> $Env:GITHUB_OUTPUT
           "include-python-version-tag=$(if ($pythonVersions.Count -gt 1) { '-IncludePythonVersionTag' })" >> $Env:GITHUB_OUTPUT
 
@@ -76,11 +76,14 @@ jobs:
     env:
       # Prevent accidentally slower type-checking due to missing arm wheels.
       # Fail rather than accidentally compile C/binary extensions from sdist.
-      UV_NO_BUILD: true
+      UV_NO_BUILD: ${{ !(matrix.python-version == '3.15' && matrix.os == 'windows-latest') }} # winrt-Windows no wheels for 3.15 yet
       # Per-package no-binary overrides no-build, allowing
       # known pure-Python source-only dependencies to still build.
       # The Build job intentionally builds some binary packages from source.
-      UV_NO_BINARY_PACKAGE: keyboard PyAutoGUI beslogic-ruff-config
+      UV_NO_BINARY_PACKAGE: >-
+        keyboard PyAutoGUI beslogic-ruff-config
+        ${{ matrix.python-version == '3.15' && 'RapidFuzz Levenshtein' || '' }}
+      # TODO: ^ Remove these exceptions once 3.15 wheels are released
     strategy:
       fail-fast: false
       # Pyright is version and platform sensible
@@ -118,6 +121,9 @@ jobs:
           - os: windows-latest
             python-version: "3.14"
             wine-compat: "-WineCompat"
+          - os: windows-latest
+            python-version: "3.15"
+            wine-compat: "-WineCompat"
     steps:
       - uses: actions/checkout@v6
         with:

pyproject.toml

@@ -7,24 +7,23 @@ dependencies = [
   "PyAutoGUI >=0.9.52",
   "PyWinCtl >=0.0.42", # py.typed
   "keyboard @ git+https://github.com/boppreh/keyboard.git", # Fix install on macos and linux-ci https://github.com/boppreh/keyboard/pull/568
-  "numpy >=2.3.2", # Python 3.14 support # TODO: Bump when 3.15 wheels
+  "numpy >=2.5.2", # Python 3.15 support
+  "packaging >=20.0", # py.typed
+  "pyinstaller >=6.21.0", # Python 3.15 support
+  "tomli-w >=1.1.0", # Typing fixes
+
   # v4.13: glibc 2.28 wheels (for aarch); v5 restored sdist
   "opencv-contrib-python-headless >=5.0; sys_platform != 'win32' or platform_machine != 'ARM64'",
   # Windows ARM64 has no opencv wheel (any version) so it source-builds the sdist.
-  # v5 sdist fails to build there (opencv-python setup.py expects an ffmpeg dll that
-  # isn't provided for win-arm64). Pin to the last 4.x that builds until win-arm64
-  # wheels ship: https://github.com/opencv/opencv-python/pull/1143
+  # v5 sdist fails to build there (opencv-python setup.py expects an ffmpeg dll that isn't
+  # provided for win-arm64). Pin to the last 4.x that builds until win-arm64 wheels ship:
+  # https://github.com/opencv/opencv-python/pull/1143
+  # https://github.com/opencv/opencv-python/issues/1092
   "opencv-contrib-python-headless ==4.11.*; sys_platform == 'win32' and platform_machine == 'ARM64'",
-  "packaging >=20.0", # py.typed
-  "tomli-w >=1.1.0", # Typing fixes
 
   # When needed, PySide6 dev builds can be found at https://download.qt.io/snapshots/ci/pyside/dev?C=M;O=D
   "PySide6-Essentials >=6.9.0", # Windows ARM64 support
 
-  #
-  # Build and compile resources
-  "pyinstaller >=6.21.0", # Python 3.15 support
-
   #
   # https://packaging.python.org/en/latest/specifications/dependency-specifiers/#environment-markers
   #
@@ -43,7 +42,7 @@ dependencies = [
   "winrt-Windows.Graphics.Imaging >=3.2.1; sys_platform == 'win32'",
   #
   # Linux-only dependencies
-  "pillow>=12.3.0; sys_platform == 'linux'", # Python 3.15 support # Necessary for ImageGrab.
+  "pillow >=12.3.0; sys_platform == 'linux'", # Python 3.15 support # Necessary for ImageGrab.
   "python-xlib >=0.33; sys_platform == 'linux'",
 ]
 [dependency-groups]
@@ -55,7 +54,7 @@ formatters = [
 dev = [
   #
   # Linters & Formatters
-  "mypy >=2.1", # TODO: Bump when 3.15 wheels
+  "mypy >=2.2", # Python 3.15 support
   "pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change
   { include-group = "formatters" },
   #
@@ -66,6 +65,7 @@ dev = [
   "types-python-xlib; sys_platform == 'linux'",
   "types-pywin32 >=306.0.0.20240130; sys_platform == 'win32'",
 ]
+
 [tool.uv]
 required-version = ">=0.11.25" # Lockfile supported environments simplifications
 environments = [
@@ -86,20 +86,26 @@ dependency-metadata = [
   { name = "PyAutoGUI", requires-dist = [] },
   { name = "types-PyAutoGUI", requires-dist = [] },
 ]
-find-links = ["./scripts"] # Discover local wheels
+override-dependencies = [
+  # opencv-contrib-python-headless requires numpy>=2,<2.3.0 but that's a bad upper bound
+  # https://github.com/opencv/opencv-python/pull/1121
+  # https://github.com/opencv/opencv-python/issues/1201
+  "numpy >=2.5.2",
+]
 
 exclude-newer = "1 week"
 [tool.uv.exclude-newer-package]
 typed-D3DShot = false # I own it
-opencv-contrib-python-headless = "1 day" # Fixed sdist
+librt = "3 day" # Fixed sdist
+numpy = "2 day" # Fixed sdist
 
 ###
 # Development channels
 ###
 [tool.uv.sources]
-beslogic-ruff-config = { git = "https://github.com/Beslogic/Beslogic-Ruff-Config", rev = "312cfab8a1e2653639a2ef665e99eac6c7412ba7" }
+beslogic-ruff-config = { git = "https://github.com/Beslogic/Beslogic-Ruff-Config", rev = "39c27278054fc428b54205581a0e23caca7ad77a" }
 # pywin32 = { git = "https://github.com/mhammond/pywin32.git", marker = "python_version >= '3.15'" }
-# pyinstaller = { url = "https://github.com/pyinstaller/pyinstaller/archive/develop.zip", marker = "python_version >= '3.15'" }
+# pyinstaller = { git = "https://github.com/pyinstaller/pyinstaller.git", marker = "python_version >= '3.15'" }
 # numpy = { index = "scientific-python-nightly-wheels", marker = "python_version >= '3.15'" }
 # pillow = { index = "scientific-python-nightly-wheels", marker = "python_version >= '3.15'" }
 

res/AutoSplit.metainfo.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-filespec -->
+<!--
+  https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-filespec
+-->
 <component type="desktop-application">
   <id>io.github.Toufool.AutoSplit</id>
   <metadata_license>CC-BY-4.0</metadata_license>
@@ -54,7 +56,8 @@
   <launchable type="desktop-id">AutoSplit.desktop</launchable>
   <releases>
     <!--
-    https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html#tag-release-url -->
+      https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html#tag-release-url
+    -->
     <url type="details">https://github.com/Toufool/AutoSplit/releases</url>
   </releases>
   <recommends>
@@ -76,12 +79,10 @@
   </developer>
   <screenshots>
     <screenshot type="default" environment="windows10:dark">
-      <image
-        source="https://raw.githubusercontent.com/Toufool/AutoSplit/refs/heads/main/docs/example.gif" />
+      <image source="https://raw.githubusercontent.com/Toufool/AutoSplit/refs/heads/main/docs/example.gif" />
     </screenshot>
     <screenshot environment="windows10:light">
-      <image
-        source="https://raw.githubusercontent.com/Toufool/AutoSplit/refs/heads/main/docs/mask_example_image.gif" />
+      <image source="https://raw.githubusercontent.com/Toufool/AutoSplit/refs/heads/main/docs/mask_example_image.gif" />
     </screenshot>
   </screenshots>
   <!-- https://hughsie.github.io/oars/ -->

ruff.toml

@@ -11,8 +11,6 @@ ignore = [
   "T20", # flake8-print
   # We use unittest, not pytest
   "PT", # flake8-pytest-style
-  # This is a relatively small, low contributors project. Git blame suffice.
-  "TD002", # missing-todo-author
   # We do work in __init__ modules
   "RUF067", # non-empty-init-module
 

scripts/compile_resources.ps1

@@ -41,9 +41,21 @@ if (-not $GITHUB_REPOSITORY) {
   $GITHUB_REPOSITORY = 'Toufool/AutoSplit'
 }
 
+# Our own top-level modules and packages, used by AutoSplit.py's lazy imports
+# filter (Python 3.15+). Generated because PyInstaller-frozen builds can't
+# discover pure modules on disk: they live inside the PYZ archive.
+$SRC_ROOT_MODULES = (
+  @('"__main__"') + (
+    Get-ChildItem ./src |
+      Where-Object { ($_.Extension -eq '.py' -or $_.PSIsContainer) -and $_.Name -notlike '__*' } |
+      ForEach-Object { "`"$($_.BaseName)`"" }
+  )
+) -join ', '
+
 New-Item $build_vars_path -ItemType File -Force | Out-Null
 Add-Content $build_vars_path "AUTOSPLIT_BUILD_NUMBER = `"$BUILD_NUMBER`""
 Add-Content $build_vars_path "AUTOSPLIT_GITHUB_REPOSITORY = `"$GITHUB_REPOSITORY`""
+Add-Content $build_vars_path "SRC_ROOT_MODULES = frozenset(($SRC_ROOT_MODULES))"
 Write-Host "Generated build number: `"$BUILD_NUMBER`""
 Write-Host "Set repository to `"$GITHUB_REPOSITORY`""
 

src/AutoSplit.py

@@ -8,6 +8,54 @@
 # Enable all warnings, which Python hides by default outside __main__
 warnings.simplefilter("default")
 
+if sys.version_info >= (3, 15):
+    # Packages whose *internal* imports must stay eager
+    # (importing them from elsewhere is still lazy):
+    # - stdlib: gains nothing (loads at startup anyway),
+    #   and its lazy proxies fail to reify under shiboken6's patched __import__
+    #   (e.g. typing.Union: "'lazy_import' object is not subscriptable").
+    # - shiboken6/shibokensupport: patch __import__ (feature_import) and exec
+    #   embedded modules behind aliased spec names
+    #   (PySide6.support.signature.* vs shibokensupport.*).
+    # - numpy: its self-check raises a bogus version conflict when imported
+    #   through shiboken6's patched __import__.
+    _EAGER_INTERNALS = (
+        frozenset({
+            "PySide6",
+            "shiboken6",
+            "shibokensupport",
+            "numpy",
+        })
+        | sys.stdlib_module_names
+    )
+
+    def _lazy_imports_filter(
+        importing: str | None,
+        imported: str,
+        fromlist: tuple[str, ...] | None = None,  # noqa: ARG001
+        /,
+    ) -> bool:
+        # No importer means exec'd/embedded code (e.g. shiboken6's signature
+        # bootstrap), which can't be trusted to resolve lazy proxies.
+        if not importing:
+            return False
+        # Imports within the same top-level package must stay eager:
+        # - A package importing its own submodule rebinds the submodule name on
+        #   the parent package, clobbering any same-named lazy proxy in the
+        #   package's namespace
+        #   (e.g. "from capture_method.ScrotCaptureMethod import ScrotCaptureMethod").
+        #   https://github.com/python/cpython/issues/151208
+        # - A relative "from . import x" binds a lazy proxy that fails to reify
+        #   on attribute access (e.g. PIL/__init__.py's
+        #   "__version__ = _version.__version__" sees the raw proxy).
+        #   TODO: Report upstream, possibly same root cause as the issue above.
+        if importing.partition(".")[0] == imported.partition(".")[0]:
+            return False
+        return importing.partition(".")[0] not in _EAGER_INTERNALS
+
+    sys.set_lazy_imports_filter(_lazy_imports_filter)
+    sys.set_lazy_imports("all")
+
 # Prevent PyAutoGUI and pywinctl from setting Process DPI Awareness,
 # which Qt tries to do then throws warnings about it.
 # The unittest workaround significantly increases

src/region_selection.py

@@ -180,7 +180,7 @@ def select_window(autosplit: AutoSplit):
     autosplit.capture_method.reinitialize()
 
     if sys.platform == "win32":
-        # Exlude the borders and titlebar from the window selection. To only get the client area.
+        # Exclude the borders and titlebar from the window selection. To only get the client area.
         _, __, window_width, window_height = get_window_bounds(hwnd)
         _, __, client_width, client_height = win32gui.GetClientRect(hwnd)
         border_width = ceil((window_width - client_width) / 2)

tests/test_import_all_modules.py

@@ -1,14 +1,16 @@
 """
 Smoke test: import every one of our own modules, including submodules.
 
-Catches import-time errors early: syntax errors, missing dependencies
-and broken platform guards in module-level code.
+Catches import-time errors early: syntax errors, missing dependencies,
+broken platform guards and lazy import issues in module-level code.
 """
 
 import importlib
 import operator
 import pkgutil
+import subprocess  # noqa: S404
 import sys
+import textwrap
 import unittest
 from pathlib import Path
 
@@ -55,8 +57,44 @@ def test_import_all_modules(self):
                 if module_name in EXPECTED_OS_ERRORS:
                     with self.assertRaises(OSError):
                         importlib.import_module(module_name)
-                else:
-                    importlib.import_module(module_name)
+                    continue
+                module = importlib.import_module(module_name)
+                # Force every lazy import proxy to resolve. eval's LOAD_NAME
+                # on the module's namespace triggers reification
+                # (plain getattr does not).
+                for attr_name in [
+                    k for k, v in vars(module).items() if type(v).__name__ == "lazy_import"
+                ]:
+                    eval(attr_name, vars(module))  # noqa: S307
+
+    def test_app_entrypoint_in_fresh_interpreter(self):
+        """
+        The test runner itself has already imported most of the stdlib, which
+        masks lazy import issues that only occur with a clean sys.modules
+        (e.g. shiboken6's bootstrap importing stdlib modules through lazy
+        proxies). Mimic a real app launch instead.
+
+        Also probes shiboken6's signature support: its bootstrap swallows
+        errors and only logs them, and it isn't otherwise guaranteed to be
+        exercised by mere imports.
+        """
+        code = textwrap.dedent("""
+            import AutoSplit
+            import inspect
+            from PySide6 import QtCore
+            signature = inspect.signature(QtCore.QObject.objectName)
+            assert isinstance(signature, inspect.Signature), signature
+        """)
+        # Trusted, hardcoded code string ran with our own interpreter
+        result = subprocess.run(  # noqa: S603
+            [sys.executable, "-c", code],
+            capture_output=True,
+            text=True,
+            check=False,
+            cwd=SRC_DIR,
+            timeout=120,
+        )
+        self.assertEqual(result.returncode, 0, msg=result.stderr)
 
 
 if __name__ == "__main__":