Add support for Python 3.13

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

@@ -46,7 +46,7 @@ jobs:
       # Ruff is version and platform sensible
       matrix:
         os: [windows-latest, ubuntu-22.04]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13-dev"]
     steps:
       - name: Checkout ${{ github.repository }}/${{ github.ref }}
         uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
       # Pyright is version and platform sensible
       matrix:
         os: [windows-latest, ubuntu-22.04]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13-dev"]
     steps:
       - name: Checkout ${{ github.repository }}/${{ github.ref }}
         uses: actions/checkout@v4
@@ -99,7 +99,10 @@ jobs:
       # Only the Python version we plan on shipping matters.
       matrix:
         os: [windows-latest, ubuntu-22.04]
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.12", "3.13-dev"]
+        include:
+          - os: ubuntu-22.04
+            python-version: "3.11" # I had some Qt Wayland issues on 3.12 for ubuntu-22.04 iirc. TODO: test it
     steps:
       - name: Checkout ${{ github.repository }}/${{ github.ref }}
         uses: actions/checkout@v4

.gitignore

@@ -12,6 +12,7 @@ env/
 build/
 dist/
 *.prof
+*.lock
 # Generated
 **/gen/*.py
 !**/gen/*.pyi

.vscode/launch.json

@@ -6,7 +6,7 @@
   "configurations": [
     {
       "name": "Python: AutoSplit (debug non-user code)",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "preLaunchTask": "Compile resources",
       "program": "src/AutoSplit.py",
@@ -15,7 +15,7 @@
     },
     {
       "name": "Python: AutoSplit",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "preLaunchTask": "Compile resources",
       "program": "src/AutoSplit.py",
@@ -24,7 +24,7 @@
     },
     {
       "name": "Python: AutoSplit --auto-controlled",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "preLaunchTask": "Compile resources",
       "program": "src/AutoSplit.py",

mypy.ini

@@ -1,6 +1,7 @@
 ; We don't run mypy in the CI. This is just to help anyone who would like to use it manually.
 ; Namely, the mypy_primer tool.
 [mypy]
+python_version = 3.11
 show_column_numbers = true
 mypy_path = $MYPY_CONFIG_FILE_DIR/typings
 implicit_reexport = true

pyproject.toml

@@ -1,3 +1,7 @@
+[project]
+name = "AutoSplit"
+version = "0"
+
 # https://github.com/microsoft/pyright/blob/main/docs/configuration.md#sample-pyprojecttoml-file
 [tool.pyright]
 typeCheckingMode = "strict"

scripts/install.ps1

@@ -43,8 +43,14 @@ If ($IsLinux) {
 &"$python" -m pip install wheel pip setuptools --upgrade
 # Upgrading QT to 6.6.2 w/o first uninstalling shiboken6 can lead to issues
 # https://bugreports.qt.io/browse/PYSIDE-2616?focusedId=777285&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-777285
-&"$python" -m pip uninstall shiboken6 -y
+# Updating from D3DShot to typed-D3DShot w/o uninstalling can cause issues (keep until version bump on PyPI)
+&"$python" -m pip uninstall shiboken6 d3dshot types-D3DShot -y
 &"$python" -m pip install -r "$PSScriptRoot/requirements$dev.txt" --upgrade
+# Temporary hack to test install for Python 3.13
+&"$python" -m pip install `
+  "https://download.qt.io/snapshots/ci/pyside/dev/c512b506b565578770c671b11afb78427ca8d012/pyside6/PySide6_Essentials-6.8.0a1.dev1727870855-cp39-abi3-win_amd64.whl ; python_version >= '3.13'" `
+  "https://download.qt.io/snapshots/ci/pyside/dev/c512b506b565578770c671b11afb78427ca8d012/pyside6/shiboken6-6.8.0a1.dev1727870855-cp39-abi3-win_amd64.whl ; python_version >= '3.13'" `
+  --ignore-requires-python
 # These libraries install extra requirements we don't want
 # Open suggestion for support in requirements files: https://github.com/pypa/pip/issues/9948 & https://github.com/pypa/pip/pull/10837
 # PyAutoGUI: We only use it for hotkeys

scripts/requirements.txt

@@ -5,28 +5,30 @@
 # Dependencies:
 git+https://github.com/boppreh/keyboard.git#egg=keyboard  # Fix install on macos and linux-ci https://github.com/boppreh/keyboard/pull/568
 Levenshtein>=0.25
-# Some modules used by OpenCV are not compiled for Numpy 2 yet on Linux. Error happens on import at runtime
-numpy>=1.26,<2.0  # Python 3.12 support
-opencv-python-headless>=4.9.0.80  # Typing fixes
+numpy>=2.1  # Python 3.13 support
+opencv-python-headless>=4.10  # NumPy 2 support
 packaging
-psutil>=5.9.6  # Python 3.12 fixes
+psutil>=6.0.0  # Python 3.13 support
 # PyAutoGUI # See install.ps1
 PyWinCtl>=0.0.42  # py.typed
 # When needed, dev builds can be found at https://download.qt.io/snapshots/ci/pyside/dev?C=M;O=D
-PySide6-Essentials>=6.6.0 # Python 3.12 support
-scipy>=1.11.2 # Python 3.12 support
+PySide6-Essentials>=6.6.0 ; python_version <= '3.12'  # Python 3.12 support
+# https://download.qt.io/snapshots/ci/pyside/dev/c512b506b565578770c671b11afb78427ca8d012/pyside6/PySide6_Essentials-6.8.0a1.dev1727870855-cp39-abi3-win_amd64.whl ; python_version >= '3.13'
+# https://download.qt.io/snapshots/ci/pyside/dev/c512b506b565578770c671b11afb78427ca8d012/pyside6/shiboken6-6.8.0a1.dev1727870855-cp39-abi3-win_amd64.whl ; python_version >= '3.13'
+scipy>=1.14.1 # Python 3.13 support
 tomli-w>=1.1.0  # Typing fixes
 typing-extensions>=4.4.0  # @override decorator support
 #
 # Build and compile resources
-pyinstaller>=5.13  # Python 3.12 support
+pyinstaller>=6.10.0  # Python 3.13 support
 #
 # https://peps.python.org/pep-0508/#environment-markers
 #
 # Windows-only dependencies:
 comtypes<1.4.5 ; sys_platform == 'win32'  # https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/807
+git+https://github.com/Avasam/typed-D3DShot.git@typed-D3DShot ; sys_platform == 'win32'
 pygrabber>=0.2 ; sys_platform == 'win32'  # Completed types
-pywin32>=301 ; sys_platform == 'win32'
+pywin32>=307 ; sys_platform == 'win32'  # Python 3.13 support
 winrt-Windows.AI.MachineLearning>=2.2.0 ; sys_platform == 'win32'  # Python 3.13 support
 winrt-Windows.Foundation>=2.2.0 ; sys_platform == 'win32'  # Python 3.13 support
 winrt-Windows.Graphics.Capture>=2.2.0 ; sys_platform == 'win32'  # Python 3.13 support
@@ -40,5 +42,6 @@ typed-D3DShot[numpy]>=1.0.1 ; sys_platform == 'win32'
 #
 # Linux-only dependencies
 PyScreeze ; sys_platform == 'linux'
-pillow ; sys_platform == 'linux' # Necessary for PyScreeze. For unknown reasons it's not pulled in on CI
+# pillow>=11.0 ; sys_platform == 'linux' # Python 3.13 support # Necessary for PyScreeze. For unknown reasons it's not pulled in on CI
+git+https://github.com/python-pillow/Pillow.git ; sys_platform == 'linux'
 python-xlib ; sys_platform == 'linux'

src/capture_method/__init__.py

@@ -6,7 +6,7 @@
 from itertools import starmap
 from typing import TYPE_CHECKING, Never, TypedDict, cast
 
 from typing_extensions import override
 
 from capture_method.CaptureMethodBase import CaptureMethodBase
 from capture_method.VideoCaptureDeviceCaptureMethod import VideoCaptureDeviceCaptureMethod
@@ -21,15 +21,16 @@
 if sys.platform == "win32":
     from _ctypes import COMError  # noqa: PLC2701 # comtypes is untyped
 
-    from pygrabber.dshow_graph import FilterGraph
-
     from capture_method.BitBltCaptureMethod import BitBltCaptureMethod
-    from capture_method.DesktopDuplicationCaptureMethod import DesktopDuplicationCaptureMethod
     from capture_method.ForceFullContentRenderingCaptureMethod import (
         ForceFullContentRenderingCaptureMethod,
     )
     from capture_method.WindowsGraphicsCaptureMethod import WindowsGraphicsCaptureMethod
 
+    if sys.version_info < (3, 13):
+        # https://github.com/enthought/comtypes/issues/618
+        from capture_method.DesktopDuplicationCaptureMethod import DesktopDuplicationCaptureMethod
+
 if sys.platform == "linux":
     import pyscreeze
     from PIL import UnidentifiedImageError, features
@@ -137,7 +138,8 @@
         import d3dshot
 
         d3dshot.create(capture_output="numpy")
-    except (ModuleNotFoundError, COMError):
+    except (ModuleNotFoundError, COMError, NameError):
+        # NameError: https://github.com/enthought/comtypes/issues/618
         pass
     else:
         CAPTURE_METHODS[CaptureMethodEnum.DESKTOP_DUPLICATION] = DesktopDuplicationCaptureMethod
@@ -182,7 +184,10 @@
 
 
 def get_input_devices():
-    if sys.platform == "win32":
+    if sys.platform == "win32" and sys.version_info < (3, 13):
+        # https://github.com/enthought/comtypes/issues/618
+        from pygrabber.dshow_graph import FilterGraph  # noqa: PLC0415
+
         return FilterGraph().get_input_devices()
 
     cameras: list[str] = []

src/utils.py

@@ -24,7 +24,6 @@
 
     import win32gui
     import win32ui
-    from pygrabber.dshow_graph import FilterGraph
     from winrt.windows.ai.machinelearning import LearningModelDevice, LearningModelDeviceKind
     from winrt.windows.media.capture import MediaCapture
 
@@ -159,8 +158,12 @@ def get_window_bounds(hwnd: int) -> tuple[int, int, int, int]:
 # Note: maybe reorganize capture_method module to have
 # different helper modules and a methods submodule
 def get_input_device_resolution(index: int) -> tuple[int, int] | None:
-    if sys.platform != "win32":
+    if sys.platform != "win32" or sys.version_info >= (3, 13):
         return (0, 0)
+
+    # https://github.com/enthought/comtypes/issues/618
+    from pygrabber.dshow_graph import FilterGraph  # noqa: PLC0415
+
     filter_graph = FilterGraph()
     try:
         filter_graph.add_video_input_device(index)