Massively sped up Flake tests

Removed 400+kb of type stubs

Author: Avasam

.flake8

@@ -2,14 +2,23 @@
 color=always
 max-line-length=120
 ; Auto generated
-exclude=src/gen/
-; Linebreak before binary operator
-; Allow default value other than "..."
-; Allow imports at the bottom of file
-ignore=W503,Y015,E402
+exclude=src/gen/, typings/cv2-stubs/__init__.pyi
+ignore=
+  W503, ; Linebreak before binary operator
+  Y015, ; Allow default value other than "..."
+  E402, ; Allow imports at the bottom of file
+  Y026, ; Not using typing_extensions
 per-file-ignores=
+    ; ???
+    ; ???
+    ; Docstrings in type stubs
+    ; Function bodys contain other than just ... (eg: raise)
+    ; Single quote docstrings
+    typings/cv2-stubs/__init__.pyi: Q000,N8, E704,E501, Y021,Y010,Q002
+
     ; Quotes
-    __init__.pyi:Q000
+    ; Naming conventions can't be controlled for external libraries
+    __init__.pyi: Q000,N8
 ; PyQt methods
 ignore-names=closeEvent,paintEvent,keyPressEvent,mousePressEvent,mouseMoveEvent,mouseReleaseEvent
 ; McCabe max-complexity is also taken care of by Pylint and doesn't fail teh build there

.gitignore

@@ -19,3 +19,4 @@ dist/
 
 # Dev settings
 *.pkl
+settings.toml

.vscode/settings.json

@@ -58,6 +58,12 @@
   "python.linting.pylintCategorySeverity.refactor": "Warning",
   "python.linting.flake8Enabled": true,
   "python.linting.flake8CategorySeverity.E": "Warning",
+  // Pyflakes
+  "python.linting.flake8CategorySeverity.F": "Warning",
+  // PEP8 Naming convention
+  "python.linting.flake8CategorySeverity.N": "Warning",
+  // PYI
+  "python.linting.flake8CategorySeverity.Y": "Warning",
   // PyRight obsoletes mypy
   "python.linting.mypyEnabled": false,
   // Is already wrapped by Flake8, prospector and pylama

pyproject.toml

@@ -15,13 +15,22 @@ aggressive = 3
 [tool.pyright]
 pythonPlatform = "Windows"
 typeCheckingMode = "strict"
+# Extra strict
+reportImplicitStringConcatenation="error"
+reportCallInDefaultInitializer="error"
+reportMissingSuperCall="none" # False positives on base classes
+reportPropertyTypeMismatch="error"
+reportUninitializedInstanceVariable="error"
+reportUnnecessaryTypeIgnoreComment="error"
+reportUnusedCallResult="none"
 ignore = [
   # Auto generated
   "src/gen/",
   # We expect stub files to be incomplete or contain useless statements as they're external
   "typings/",
 ]
-reportMissingTypeStubs = "information"
+# Type stubs may not be completable
+reportMissingTypeStubs = "warning"
 # False positives with TYPE_CHECKING
 reportImportCycles = "information"
 # PyQt .connect

scripts/requirements.txt

@@ -26,8 +26,8 @@ requests
 bandit
 flake8
 flake8-quotes
-pylint
-pywin32-stubs
+pylint>=2.13
+git+https://github.com/Avasam/pywin32-stubs.git#egg=pywin32-stubs # https://github.com/kaluluosi/pywin32-stubs/pull/4
 simplejson
 types-simplejson>=3.17.2
 types-requests

src/AutoSplit.py

@@ -59,7 +59,7 @@ def excepthook(exception_type: type[BaseException], exception: BaseException, _t
     return excepthook
 
 
-class AutoSplit(QMainWindow, design.Ui_MainWindow):
+class AutoSplit(QMainWindow, design.Ui_main_window):
     myappid = f"Toufool.AutoSplit.v{VERSION}"
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
@@ -224,7 +224,7 @@ def __init__(self, parent: Optional[QWidget] = None):
 
         self.show()
 
-        # Needs to be after Ui_MainWindow.show() to be shown overtop
+        # Needs to be after Ui_main_window.show() to be shown overtop
         if self.action_check_for_updates_on_open.isChecked():
             check_for_updates(self, check_on_open=True)
 
@@ -796,8 +796,7 @@ def __get_capture_for_comparison(self):
         if capture is None:
             # Try to recover by using the window name
             self.live_image.setText("Trying to recover window...")
-            # https://github.com/kaluluosi/pywin32-stubs/issues/7
-            hwnd = win32gui.FindWindow(None, self.window_text)  # type: ignore
+            hwnd = win32gui.FindWindow(None, self.window_text)
             # Don't fallback to desktop
             if hwnd:
                 self.hwnd = hwnd

src/capture_windows.py

@@ -45,8 +45,7 @@ def capture_region(hwnd: int, selection: Rect, print_window: bool):
     # If the window closes while it's being manipulated, it could cause a crash
     try:
         window_dc: int = win32gui.GetWindowDC(hwnd)
-        # https://github.com/kaluluosi/pywin32-stubs/issues/6
-        dc_object: PyCDC = win32ui.CreateDCFromHandle(window_dc)  # type: ignore
+        dc_object: PyCDC = win32ui.CreateDCFromHandle(window_dc)
 
         # Causes a 10-15x performance drop. But allows recording hardware accelerated windows
         if print_window:

src/menu_bar.py

@@ -36,7 +36,7 @@ def open_about(autosplit: AutoSplit):
 
 
 class __UpdateCheckerWidget(QtWidgets.QWidget, update_checker.Ui_UpdateChecker):
-    def __init__(self, latest_version: str, design_window: design.Ui_MainWindow, check_on_open: bool = False):
+    def __init__(self, latest_version: str, design_window: design.Ui_main_window, check_on_open: bool = False):
         super().__init__()
         self.setupUi(self)
         self.current_version_number_label.setText(VERSION)

src/settings_file.py

@@ -27,7 +27,7 @@ def find_class(self, module: str, name: str):
         raise pickle.UnpicklingError(f"'{module}.{name}' is forbidden")
 
 
-def get_save_settings_values(autosplit: AutoSplit):
+def get_save_settings_values(autosplit: AutoSplit) -> list[str | int]:
     return [
         autosplit.split_image_directory,
         autosplit.similarity_threshold_spinbox.value(),
@@ -146,14 +146,14 @@ def __load_settings_from_file(autosplit: AutoSplit, load_settings_file_path: str
     autosplit.force_print_window_checkbox.setChecked(settings[20])
 
     if autosplit.window_text:
-        # https://github.com/kaluluosi/pywin32-stubs/issues/7
-        hwnd = win32gui.FindWindow(None, autosplit.window_text)  # type: ignore
+        hwnd = win32gui.FindWindow(None, autosplit.window_text)
         if hwnd:
             autosplit.hwnd = hwnd
         else:
-            autosplit.live_image.setText("Reload settings after opening"
-                                         f'\n"{autosplit.window_text}"'
-                                         "\nto automatically load Live Capture")
+            autosplit.live_image.setText(
+                "Reload settings after opening"
+                + f'\n"{autosplit.window_text}"'
+                + "\nto automatically load Live Capture")
     return True
 
 
@@ -203,7 +203,7 @@ def load_check_for_updates_on_open(autosplit: AutoSplit):
     autosplit.action_check_for_updates_on_open.setChecked(value)
 
 
-def set_check_for_updates_on_open(design_window: design.Ui_MainWindow, value: bool):
+def set_check_for_updates_on_open(design_window: design.Ui_main_window, value: bool):
     """
     Sets the "Check For Updates On Open" QSettings value and the checkbox state
     """

typings/PyInstaller/utils/hooks/__init__.pyi

@@ -1,8 +1,7 @@
-"""
+""" # noqa: Y021
 This type stub file was generated by pyright.
 """
-from typing import Any, Literal, Optional, Union
-from collections.abc import Callable
+from typing import Any, Literal, Optional, Union, Callable
 
 logger = ...
 PY_IGNORE_EXTENSIONS: set
@@ -85,11 +84,7 @@ def is_module_or_submodule(name, mod_or_submod):
     ...
 
 
-PY_DYLIB_PATTERNS = [
-    "*.dll",
-    "*.dylib",
-    "lib*.so",
-]
+PY_DYLIB_PATTERNS: str
 
 
 def collect_dynamic_libs(package: str, destdir: Optional[str] = ...) -> list[tuple[str, str]]:

typings/imagehash/__init__.pyi

@@ -1,23 +1,16 @@
-"""
+""" # noqa: Y021
 This type stub file was generated by pyright.
 """
 from __future__ import absolute_import, division, print_function, annotations
-from PIL import Image, ImageFilter
-import numpy
+from PIL import Image
 
-__version__ = ...
+__version__: str
 
 
 class ImageHash:
     def __init__(self, binary_array) -> None:
         ...
 
-    def __str__(self) -> str:
-        ...
-
-    def __repr__(self) -> str:
-        ...
-
     def __sub__(self, other: ImageHash) -> int:
         ...
 
@@ -90,13 +83,7 @@ class ImageMultiHash:
     def __hash__(self) -> int:
         ...
 
-    def __str__(self) -> str:
-        ...
-
-    def __repr__(self) -> str:
-        ...
-
-    def hash_diff(self, other_hash, hamming_cutoff=..., bit_error_rate=...) -> tuple[int, Unknown | int]:
+    def hash_diff(self, other_hash, hamming_cutoff=..., bit_error_rate=...) -> tuple[int, int]:
         ...
 
     def matches(self, other_hash, region_cutoff=..., hamming_cutoff=..., bit_error_rate=...):