Upgrade mypy 2.0 and Ruff 0.15.4

Author: Avasam

mypy.ini

@@ -5,30 +5,39 @@
 # https://github.com/BesLogic/shared-configs/blob/main/mypy.ini
 # Modifications to this file that are not project-specific should also be done upstream.
 
+# This config file assumes Mypy 2.0+
+
 # https://mypy.readthedocs.io/en/stable/config_file.html
 [mypy]
 ###
 # General settings
 ###
-fixed_format_cache = true
 show_column_numbers = true
-strict = true
-strict_equality_for_none = true
-report_deprecated_as_note = true
-follow_untyped_imports = true
-allow_redefinition_new = true
-local_partial_types = true
 
+###
+# Strictness flags
 # All below are rules and codes not enabled by default even with strict=true
+###
+strict = true
+strict_equality_for_none = true
+warn_unreachable = true
 ; <removed section from upstream>
 ; 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.
 
+###
+# Reduced strictness, where flexibility is preferred
+###
+allow_redefinition = true
+report_deprecated_as_note = true
+# Disable this if you want to ensure all your dependencies are typed
+follow_untyped_imports = true
+
 # Implicit return types using pyright ! (mypy doesn't do implicit return types)
 # Note: mypy still has issues with some boolean inferred returns:
 # https://github.com/python/mypy/issues/4409
 # https://github.com/python/mypy/issues/10149
-# Comment out if not using pyright or implicit types
+# Comment out/remove if not using pyright or implicit types (like for a library)
 check_untyped_defs = true
 disallow_untyped_calls = false
 disallow_untyped_defs = false

pyproject.toml

@@ -52,8 +52,8 @@ dev = [
   "qt6-applications >=6.5.0",
   #
   # Linters & Formatters
-  "dprint-py>=0.50.0.0",
-  "mypy >=1.19",
+  "dprint-py >=0.50.0.0",
+  "mypy >=2.1",
   "pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change
   { include-group = "ruff" },
   #
@@ -76,6 +76,9 @@ dependency-metadata = [
   { name = "PyAutoGUI", requires-dist = [] },
   { name = "types-PyAutoGUI", requires-dist = [] },
 ]
+exclude-newer = "1 week"
+[tool.uv.exclude-newer-package]
+ruff = "4 days" # Needs 0.15.4
 
 [tool.uv.sources] # Development channels
 beslogic-ruff-config = { git = "https://github.com/Beslogic/Beslogic-Ruff-Config" }
@@ -111,8 +114,8 @@ enableExperimentalFeatures = true
 reportCallInDefaultInitializer = "error"
 reportImplicitOverride = "error"
 reportImplicitStringConcatenation = "error"
-# False positives with TYPE_CHECKING
-reportImportCycles = "information"
+# False positives with TYPE_CHECKING, mostly covered by Ruff TCH00
+reportImportCycles = "none"
 # Too strict. False positives on base classes
 reportMissingSuperCall = "none"
 reportPropertyTypeMismatch = "error"

ruff.toml

@@ -19,16 +19,8 @@ ignore = [
   ###
   "PTH", # flake8-use-pathlib
   "RUF028", # invalid-formatter-suppression-comment, Is meant for the formatter, but false-positives
-  # Disabled until https://github.com/astral-sh/ruff/issues/23185 is fixed
-  "TC00",
 ]
 
-# https://docs.astral.sh/ruff/settings/#isort
-[lint.isort]
-# The src-based layout detection can differ on CI
-# TODO: Check if this has been fixed in Ruff 0.13
-known-third-party = ["gen"]
-
 [lint.per-file-ignores]
 "src/d3d11.py" = [
   # Following windows API/ctypes like naming conventions

src/AutoSplit.py

@@ -32,11 +32,9 @@ def do_nothing(*_): ...
 from copy import deepcopy
 from time import time
 from types import FunctionType
-from typing import NoReturn, override
+from typing import TYPE_CHECKING, NoReturn, override
 
 import cv2
-from cv2.typing import MatLike
-from gen import about, design, settings, update_checker
 from PySide6 import QtCore, QtGui
 from PySide6.QtTest import QTest
 from PySide6.QtWidgets import QApplication, QFileDialog, QLabel, QMainWindow, QMessageBox
@@ -45,7 +43,9 @@ def do_nothing(*_): ...
 import user_profile
 from AutoControlledThread import AutoControlledThread
 from AutoSplitImage import START_KEYWORD, AutoSplitImage, ImageType
-from capture_method import CaptureMethodBase, CaptureMethodEnum
+from capture_method import CaptureMethodEnum
+from capture_method.CaptureMethodBase import CaptureMethodBase
+from gen import about, design, settings, update_checker
 from hotkeys import (
     HOTKEYS,
     KEYBOARD_GROUPS_ISSUE,
@@ -87,6 +87,9 @@ def do_nothing(*_): ...
     open_file,
 )
 
+if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
 CHECK_FPS_ITERATIONS = 10
 
 
@@ -1073,7 +1076,7 @@ def main():
     QApplication.setStyle("fusion")
     # Call to QApplication outside the try-except so we can show error messages
     app = QApplication(sys.argv)
-    try:
+    try:  # noqa: PLW0717 # We really want to catch everything here
         if sys.platform == "win32":
             myappid = f"Toufool.AutoSplit.v{AUTOSPLIT_VERSION}"
             shell32.SetCurrentProcessExplicitAppUserModelID(myappid)

src/AutoSplitImage.py

@@ -8,7 +8,6 @@
 
 import cv2
 import numpy as np
-from cv2.typing import MatLike
 
 import error_messages
 from compare import (
@@ -27,6 +26,8 @@
 )
 
 if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
     from AutoSplit import AutoSplit
 
 

src/capture_method/BitBltCaptureMethod.py

@@ -3,18 +3,20 @@
 if sys.platform != "win32":
     raise OSError
 import ctypes
-from typing import override
+from typing import TYPE_CHECKING, override
 
 import numpy as np
 import pywintypes
 import win32con
 import win32gui
 import win32ui
-from cv2.typing import MatLike
 
 from capture_method.CaptureMethodBase import CaptureMethodBase
 from utils import BGRA_CHANNEL_COUNT, get_window_bounds, is_valid_hwnd, try_delete_dc
 
+if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
 # This is an undocumented nFlag value for PrintWindow
 PW_RENDERFULLCONTENT = 0x00000002
 
@@ -48,7 +50,7 @@ def get_frame(self) -> MatLike | None:
             return None
 
         # If the window closes while it's being manipulated, it could cause a crash
-        try:
+        try:  # noqa: PLW0717
             window_dc = win32gui.GetWindowDC(hwnd)
             dc_object = win32ui.CreateDCFromHandle(window_dc)
 

src/capture_method/CaptureMethodBase.py

@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
-from cv2.typing import MatLike
-
 from utils import is_valid_hwnd
 
 if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
     from AutoSplit import AutoSplit
 
 

src/capture_method/Screenshot using QT attempt.py

@@ -2,15 +2,17 @@
 
 if sys.platform != "linux":
     raise OSError
-from typing import cast, override
+from typing import TYPE_CHECKING, cast, override
 
 import numpy as np
-from cv2.typing import MatLike
 from PySide6.QtCore import QBuffer, QIODeviceBase
 from PySide6.QtGui import QGuiApplication
 
 from capture_method.CaptureMethodBase import CaptureMethodBase
 
+if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
 
 class QtCaptureMethod(CaptureMethodBase):
     _render_full_content = False
@@ -28,7 +30,7 @@ def get_frame(self):
         b = image.bits()
         # sip.voidptr must know size to support python buffer interface
         # b.setsize(200 * 200 * 3)
-        frame = np.frombuffer(cast(MatLike, b), np.uint8).reshape((200, 200, 3))
+        frame = np.frombuffer(cast("MatLike", b), np.uint8).reshape((200, 200, 3))
 
         # frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
         return frame  # noqa: RET504

src/capture_method/ScrotCaptureMethod.py

@@ -28,7 +28,7 @@ def _scrot_screenshot(x: int, y: int, width: int, height: int):
         screenshot_file = os.path.join(tmp, "autosplit")
         try:
             subprocess.check_call((  # noqa: S603 # Not user input
-                "scrot",
+                "/usr/bin/scrot",
                 "-a",
                 f"{x},{y},{width},{height}",
                 "-z",

src/capture_method/VideoCaptureDeviceCaptureMethod.py

@@ -6,13 +6,14 @@
 import cv2
 import cv2.Error
 import numpy as np
-from cv2.typing import MatLike
 
 from capture_method.CaptureMethodBase import CaptureMethodBase
 from error_messages import CREATE_NEW_ISSUE_MESSAGE, exception_traceback
 from utils import ImageShape, get_input_device_resolution, is_valid_image
 
 if TYPE_CHECKING:
+    from cv2.typing import MatLike
+
     from AutoSplit import AutoSplit
 
 OBS_VIRTUALCAM_PLUGIN_BLANK_PIXEL = (127, 129, 128)
@@ -48,7 +49,7 @@ class VideoCaptureDeviceCaptureMethod(CaptureMethodBase):
     is_old_image = False
 
     def __read_loop(self):
-        try:
+        try:  # noqa: PLW0717 # We really want to catch everything here
             while not self.stop_thread.is_set():
                 try:
                     result, image = self.capture_device.read()