Update Ruff to 0.13.0

Avasam · Avasam · commit 9f6cf534bb1b · 2025-09-10T17:46:09.000-04:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,7 +54,7 @@ dev = [
   "dprint-py>=0.50.0.0",
   "mypy[faster-cache] >=1.16",
   "pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change
-  "ruff >=0.12.0",
+  "ruff >=0.13.0",
   #
   # Types
   "types-PyAutoGUI",
diff --git a/ruff.toml b/ruff.toml
@@ -8,12 +8,13 @@
 # https://docs.astral.sh/ruff/configuration/
 line-length = 100
 preview = true
-required-version = ">=0.11.0" # tool.ruff.target-version is inferred from project.requires-python
+required-version = ">=0.13.0" # tool.ruff.target-version is inferred from project.requires-python
 
 [format]
 docstring-code-format = true
 
 [lint]
+future-annotations = true
 select = ["ALL"]
 # https://docs.astral.sh/ruff/rules/
 ignore = [
@@ -34,8 +35,6 @@ ignore = [
   "ERA001", # eradicate: commented-out-code
   # contextlib.suppress is roughly 3x slower than try/except
   "SIM105", # flake8-simplify: use-contextlib-suppress
-  # Negative performance impact and more verbose https://github.com/astral-sh/ruff/issues/7871
-  "UP038", # non-pep604-isinstance
   # Not colored correctly in Pylance https://github.com/microsoft/pylance-release/issues/6942
   "UP047", # non-pep695-generic-function
   # Checked by type-checker (pyright/mypy)
@@ -103,8 +102,6 @@ ignore = [
   ###
   "CPY001", # flake8-copyright
   "PTH", # flake8-use-pathlib
-  # Ignore until linux support
-  "EXE", # flake8-executable
 ]
 
 # https://docs.astral.sh/ruff/settings/#flake8-implicit-str-concat
diff --git a/src/AutoControlledThread.py b/src/AutoControlledThread.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from PySide6 import QtCore
@@ -10,7 +12,7 @@
 
 
 class AutoControlledThread(QtCore.QThread):
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         self._autosplit_ref = autosplit
         super().__init__()
 
diff --git a/src/AutoSplitImage.py b/src/AutoSplitImage.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import tomllib
 from enum import IntEnum, auto
@@ -67,39 +69,39 @@ def is_ocr(self):
         """
         return bool(self.texts)
 
-    def get_delay_time(self, default: "AutoSplit | int"):
+    def get_delay_time(self, default: AutoSplit | int):
         """Get image's delay time or fallback to the default value from spinbox."""
         if self.__delay_time is not None:
             return self.__delay_time
         if isinstance(default, int):
             return default
         return default.settings_dict["default_delay_time"]
 
-    def __get_comparison_method_index(self, default: "AutoSplit | int"):
+    def __get_comparison_method_index(self, default: AutoSplit | int):
         """Get image's comparison or fallback to the default value from combobox."""
         if self.__comparison_method is not None:
             return self.__comparison_method
         if isinstance(default, int):
             return default
         return default.settings_dict["default_comparison_method"]
 
-    def get_pause_time(self, default: "AutoSplit | float"):
+    def get_pause_time(self, default: AutoSplit | float):
         """Get image's pause time or fallback to the default value from spinbox."""
         if self.__pause_time is not None:
             return self.__pause_time
         if isinstance(default, (float, int)):
             return default
         return default.settings_dict["default_pause_time"]
 
-    def get_similarity_threshold(self, default: "AutoSplit | float"):
+    def get_similarity_threshold(self, default: AutoSplit | float):
         """Get image's similarity threshold or fallback to the default value from spinbox."""
         if self.__similarity_threshold is not None:
             return self.__similarity_threshold
         if isinstance(default, (float, int)):
             return default
         return default.settings_dict["default_similarity_threshold"]
 
-    def get_fps_limit(self, default: "AutoSplit"):
+    def get_fps_limit(self, default: AutoSplit):
         """Get image's fps limit or fallback to the default value from spinbox."""
         if self.__fps_limit != 0:
             return self.__fps_limit
@@ -197,7 +199,7 @@ def __read_image_bytes(self, path: str):
     def check_flag(self, flag: int):
         return self.flags & flag == flag
 
-    def compare_with_capture(self, default: "AutoSplit | int", capture: MatLike | None):
+    def compare_with_capture(self, default: AutoSplit | int, capture: MatLike | None):
         """
         Compare image with capture using image's comparison method. Falls back to combobox.
 
diff --git a/src/capture_method/CaptureMethodBase.py b/src/capture_method/CaptureMethodBase.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from cv2.typing import MatLike
@@ -13,9 +15,9 @@ class CaptureMethodBase:
     short_description = ""
     description = ""
 
-    _autosplit_ref: "AutoSplit"
+    _autosplit_ref: AutoSplit
 
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         self._autosplit_ref = autosplit
 
     def reinitialize(self):
diff --git a/src/capture_method/DesktopDuplicationCaptureMethod.py b/src/capture_method/DesktopDuplicationCaptureMethod.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 if sys.platform != "win32":
@@ -30,7 +32,7 @@ class DesktopDuplicationCaptureMethod(BitBltCaptureMethod):
 see D3DDD-Note-Laptops.md for a solution.
 https://www.github.com/{GITHUB_REPOSITORY}/blob/main/docs/D3DDD-Note-Laptops.md"""
 
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         super().__init__(autosplit)
         # Must not set statically as some laptops will throw an error
         self.desktop_duplication = d3dshot.create(capture_output="numpy")
diff --git a/src/capture_method/VideoCaptureDeviceCaptureMethod.py b/src/capture_method/VideoCaptureDeviceCaptureMethod.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from threading import Event, Thread
 from typing import TYPE_CHECKING, override
 
@@ -86,7 +88,7 @@ def __read_loop(self):
                 )
             )
 
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         super().__init__(autosplit)
         self.capture_device = cv2.VideoCapture(autosplit.settings_dict["capture_device_id"])
         self.capture_device.setExceptionMode(True)
diff --git a/src/capture_method/WindowsGraphicsCaptureMethod.py b/src/capture_method/WindowsGraphicsCaptureMethod.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 if sys.platform != "win32":
@@ -41,13 +43,13 @@ class WindowsGraphicsCaptureMethod(CaptureMethodBase):
 Adds a yellow border on Windows 10 (not on Windows 11).
 Caps at around 60 FPS."""
 
-    size: "SizeInt32"
+    size: SizeInt32
     frame_pool: Direct3D11CaptureFramePool | None = None
     session: GraphicsCaptureSession | None = None
     """This is stored to prevent session from being garbage collected"""
     last_converted_frame: MatLike | None = None
 
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         super().__init__(autosplit)
         if not is_valid_hwnd(autosplit.hwnd):
             return
diff --git a/src/capture_method/__init__.py b/src/capture_method/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 from collections import OrderedDict
@@ -148,7 +150,7 @@ def get(self, key: CaptureMethodEnum, default: object = None, /):
 CAPTURE_METHODS[CaptureMethodEnum.VIDEO_CAPTURE_DEVICE] = VideoCaptureDeviceCaptureMethod
 
 
-def change_capture_method(selected_capture_method: CaptureMethodEnum, autosplit: "AutoSplit"):
+def change_capture_method(selected_capture_method: CaptureMethodEnum, autosplit: AutoSplit):
     """
     Seamlessly change the current capture method,
     initialize the new one with transferred subscriptions
diff --git a/src/d3d11.py b/src/d3d11.py
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2024 David Lechner <david@pybricks.com>
+from __future__ import annotations
+
 import sys
 
 if sys.platform != "win32":
@@ -39,7 +41,7 @@ class IUnknown(ctypes.c_void_p):
     AddRef = ctypes.WINFUNCTYPE(wintypes.ULONG)(1, "AddRef")
     Release = ctypes.WINFUNCTYPE(wintypes.ULONG)(2, "Release")
 
-    def query_interface(self, iid: uuid.UUID | str) -> "IUnknown":
+    def query_interface(self, iid: uuid.UUID | str) -> IUnknown:
         if isinstance(iid, str):
             iid = uuid.UUID(iid)
 
@@ -174,7 +176,7 @@ class D3D_FEATURE_LEVEL(enum.IntEnum):
 
 def errcheck(
     result: int,
-    _func: "_FuncPointer",  # Actually WinFunctionType but that's an internal class
+    _func: _FuncPointer,  # Actually WinFunctionType but that's an internal class
     args: tuple[
         IUnknown | None,  # IDXGIAdapter
         D3D_DRIVER_TYPE,
diff --git a/src/error_messages.py b/src/error_messages.py
@@ -1,5 +1,7 @@
 """Error messages."""
 
+from __future__ import annotations
+
 import os
 import signal
 import sys
@@ -225,7 +227,7 @@ def exception_traceback(exception: BaseException, message: str = ""):
 )
 
 
-def make_excepthook(autosplit: "AutoSplit"):
+def make_excepthook(autosplit: AutoSplit):
     def excepthook(
         exception_type: type[BaseException],
         exception: BaseException,
diff --git a/src/hotkeys.py b/src/hotkeys.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Literal, cast
@@ -56,15 +58,15 @@ def remove_all_hotkeys():
         keyboard.unhook_all()
 
 
-def before_setting_hotkey(autosplit: "AutoSplit"):
+def before_setting_hotkey(autosplit: AutoSplit):
     """Do all of these after you click "Set Hotkey" but before you type the hotkey."""
     autosplit.start_auto_splitter_button.setEnabled(False)
     if autosplit.SettingsWidget:
         for hotkey in HOTKEYS:
             getattr(autosplit.SettingsWidget, f"set_{hotkey}_hotkey_button").setEnabled(False)
 
 
-def after_setting_hotkey(autosplit: "AutoSplit"):
+def after_setting_hotkey(autosplit: AutoSplit):
     """
     Do all of these things after you set a hotkey.
     A signal connects to this because changing GUI stuff is only possible in the main thread.
@@ -80,7 +82,7 @@ def after_setting_hotkey(autosplit: "AutoSplit"):
             getattr(autosplit.SettingsWidget, f"set_{hotkey}_hotkey_button").setEnabled(True)
 
 
-def send_command(autosplit: "AutoSplit", command: CommandStr):
+def send_command(autosplit: AutoSplit, command: CommandStr):
     if command in autosplit.settings_dict["screenshot_on"]:
         autosplit.screenshot_signal.emit()
     match command:
@@ -248,7 +250,7 @@ def __read_hotkey():
     return __get_hotkey_name(names)
 
 
-def __remove_key_already_set(autosplit: "AutoSplit", key_name: str):
+def __remove_key_already_set(autosplit: AutoSplit, key_name: str):
     for hotkey in HOTKEYS:
         settings_key = f"{hotkey}_hotkey"
         if autosplit.settings_dict.get(settings_key) == key_name:
@@ -258,7 +260,7 @@ def __remove_key_already_set(autosplit: "AutoSplit", key_name: str):
                 getattr(autosplit.SettingsWidget, f"{hotkey}_input").setText("")
 
 
-def __get_hotkey_action(autosplit: "AutoSplit", hotkey: Hotkey):
+def __get_hotkey_action(autosplit: AutoSplit, hotkey: Hotkey):
     if hotkey == "split":
         return autosplit.start_auto_splitter
     if hotkey == "skip_split":
@@ -288,7 +290,7 @@ def is_valid_hotkey_name(hotkey_name: str):
 # reduce duplicated code. We should use a dictionary of hotkey class or something.
 
 
-def set_hotkey(autosplit: "AutoSplit", hotkey: Hotkey, preselected_hotkey_name: str = ""):
+def set_hotkey(autosplit: AutoSplit, hotkey: Hotkey, preselected_hotkey_name: str = ""):
     if KEYBOARD_GROUPS_ISSUE:
         if not preselected_hotkey_name:
             error_messages.linux_groups()
diff --git a/src/menu_bar.py b/src/menu_bar.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import sys
 import webbrowser
@@ -59,7 +61,7 @@ def __init__(self):
         self.show()
 
 
-def open_about(autosplit: "AutoSplit"):
+def open_about(autosplit: AutoSplit):
     if not autosplit.AboutWidget or cast(QtWidgets.QWidget, autosplit.AboutWidget).isHidden():
         autosplit.AboutWidget = __AboutWidget()
 
@@ -102,7 +104,7 @@ def do_not_ask_me_again_state_changed(self):
         )
 
 
-def open_update_checker(autosplit: "AutoSplit", latest_version: str, *, check_on_open: bool):
+def open_update_checker(autosplit: AutoSplit, latest_version: str, *, check_on_open: bool):
     if (
         not autosplit.UpdateCheckerWidget
         or cast(QtWidgets.QWidget, autosplit.UpdateCheckerWidget).isHidden()
@@ -119,7 +121,7 @@ def view_help():
 
 
 class __CheckForUpdatesThread(QtCore.QThread):
-    def __init__(self, autosplit: "AutoSplit", *, check_on_open: bool):
+    def __init__(self, autosplit: AutoSplit, *, check_on_open: bool):
         super().__init__()
         self._autosplit_ref = autosplit
         self.check_on_open = check_on_open
@@ -150,7 +152,7 @@ def about_qt_for_python():
     webbrowser.open("https://wiki.qt.io/Qt_for_Python")
 
 
-def check_for_updates(autosplit: "AutoSplit", *, check_on_open: bool = False):
+def check_for_updates(autosplit: AutoSplit, *, check_on_open: bool = False):
     autosplit.CheckForUpdatesThread = __CheckForUpdatesThread(
         autosplit,
         check_on_open=check_on_open,
@@ -159,7 +161,7 @@ def check_for_updates(autosplit: "AutoSplit", *, check_on_open: bool = False):
 
 
 class __SettingsWidget(QtWidgets.QWidget, settings_ui.Ui_SettingsWidget):
-    def __init__(self, autosplit: "AutoSplit"):
+    def __init__(self, autosplit: AutoSplit):
         super().__init__()
         self.__video_capture_devices: list[CameraInfo] = []
         """
@@ -461,12 +463,12 @@ def add_or_del(checked: Literal[0, 2], command: CommandStr = command):
         # endregion
 
 
-def open_settings(autosplit: "AutoSplit"):
+def open_settings(autosplit: AutoSplit):
     if not autosplit.SettingsWidget or cast(QtWidgets.QWidget, autosplit.SettingsWidget).isHidden():
         autosplit.SettingsWidget = __SettingsWidget(autosplit)
 
 
-def get_default_settings_from_ui(autosplit: "AutoSplit"):
+def get_default_settings_from_ui(autosplit: AutoSplit):
     temp_dialog = QtWidgets.QWidget()
     default_settings_dialog = settings_ui.Ui_SettingsWidget()
     default_settings_dialog.setupUi(temp_dialog)
diff --git a/src/region_selection.py b/src/region_selection.py
diff --git a/src/split_parser.py b/src/split_parser.py
diff --git a/src/user_profile.py b/src/user_profile.py
diff --git a/src/utils.py b/src/utils.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ dev = [`
`54`	`54`	`"dprint-py>=0.50.0.0",`
`55`	`55`	`"mypy[faster-cache] >=1.16",`
`56`	`56`	`"pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change`
`57`		`- "ruff >=0.12.0",`
	`57`	`+ "ruff >=0.13.0",`
`58`	`58`	`#`
`59`	`59`	`# Types`
`60`	`60`	`"types-PyAutoGUI",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`from threading import Event, Thread`
`2`	`4`	`from typing import TYPE_CHECKING, override`
`3`	`5`
`@@ -86,7 +88,7 @@ def __read_loop(self):`
`86`	`88`	`)`
`87`	`89`	`)`
`88`	`90`
`89`		`- def __init__(self, autosplit: "AutoSplit"):`
	`91`	`+ def __init__(self, autosplit: AutoSplit):`
`90`	`92`	`super().__init__(autosplit)`
`91`	`93`	`self.capture_device = cv2.VideoCapture(autosplit.settings_dict["capture_device_id"])`
`92`	`94`	`self.capture_device.setExceptionMode(True)`