Use dev wheels of OpenCV 4.8 to include cv2.typing at runtime

Author: Avasam

…ss-4.7.0+772599a-cp37-abi3-win_amd64.whl …ss-4.8.0+4f81552-cp37-abi3-win_amd64.whlres/opencv_python_headless-4.7.0+772599a-cp37-abi3-win_amd64.whl renamed to res/opencv_python_headless-4.8.0+4f81552-cp37-abi3-win_amd64.whl res/opencv_python_headless-4.7.0+772599a-cp37-abi3-win_amd64.whl renamed to res/opencv_python_headless-4.8.0+4f81552-cp37-abi3-win_amd64.whl

@@ -7,17 +7,18 @@ certifi
 ImageHash>=4.3.1  # Contains type information + setup as package not module
 git+https://github.com/boppreh/keyboard.git#egg=keyboard  # Fix install on macos and linux-ci https://github.com/boppreh/keyboard/pull/568
 numpy>=1.23.2  # Python 3.11 wheels
-# wheel-0-1-0-x64 from https://github.com/opencv/opencv-python/actions/runs/5227795017
-./res/opencv_python_headless-4.7.0+772599a-cp37-abi3-win_amd64.whl # New typing + OBS Camera fixes
+# From https://github.com/opencv/opencv-python/actions/runs/5461702800
+./res/opencv_python_headless-4.8.0+4f81552-cp37-abi3-win_amd64.whl
+# opencv-python-headless>=4.8.0.74  # New typing + OBS Camera fixes
 packaging
 Pillow>=9.2  # gnome-screeshot checks
 psutil
 PyAutoGUI
-PyWinCtl>=0.0.42 # py.typed
-PySide6-Essentials>=6.5.1 # fixes incomplete tuple return types https://bugreports.qt.io/browse/PYSIDE-2285
+PyWinCtl>=0.0.42  # py.typed
+PySide6-Essentials>=6.5.1  # fixes incomplete tuple return types https://bugreports.qt.io/browse/PYSIDE-2285
 requests<=2.28.1  # 2.28.2 has issues with PyInstaller https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/534
 toml
-typing-extensions>=4.4.0 # @override decorator support
+typing-extensions>=4.4.0  # @override decorator support
 #
 # Build and compile resources
 pyinstaller>=5.5  # Python 3.11 support

scripts/requirements.txt

@@ -8,10 +8,11 @@
 from collections.abc import Callable
 from time import time
 from types import FunctionType
-from typing import TYPE_CHECKING, NoReturn
+from typing import NoReturn
 
 import certifi
 import cv2
+import cv2.typing
 from psutil import process_iter
 from PySide6 import QtCore, QtGui
 from PySide6.QtTest import QTest
@@ -49,9 +50,6 @@
     open_file,
 )
 
-if TYPE_CHECKING:
-    import cv2.typing
-
 CHECK_FPS_ITERATIONS = 10
 DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 = 2
 

src/AutoSplit.py

@@ -6,14 +6,14 @@
 from typing import TYPE_CHECKING
 
 import cv2
+import cv2.typing
 import numpy as np
 
 import error_messages
 from compare import COMPARE_METHODS_BY_INDEX, check_if_image_has_transparency
 from utils import BGR_CHANNEL_COUNT, MAXBYTE, ColorChannel, ImageShape, is_valid_image
 
 if TYPE_CHECKING:
-    import cv2.typing
 
     from AutoSplit import AutoSplit
 

src/AutoSplitImage.py

@@ -5,6 +5,7 @@
 from typing import TYPE_CHECKING, cast
 
 import cv2
+import cv2.typing
 import numpy as np
 import pywintypes
 import win32con
@@ -16,7 +17,6 @@
 from utils import BGRA_CHANNEL_COUNT, get_window_bounds, is_valid_hwnd, try_delete_dc
 
 if TYPE_CHECKING:
-    import cv2.typing
 
     from AutoSplit import AutoSplit
 

src/capture_method/BitBltCaptureMethod.py

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

src/capture_method/CaptureMethodBase.py

@@ -5,6 +5,7 @@
 
 import cv2
 import cv2.Error
+import cv2.typing
 import numpy as np
 from pygrabber.dshow_graph import FilterGraph
 from typing_extensions import override
@@ -14,7 +15,6 @@
 from utils import ImageShape, is_valid_image
 
 if TYPE_CHECKING:
-    import cv2.typing
 
     from AutoSplit import AutoSplit
 

src/capture_method/VideoCaptureDeviceCaptureMethod.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, cast
 
 import cv2
+import cv2.typing
 import numpy as np
 from typing_extensions import override
 from win32 import win32gui
@@ -17,7 +18,6 @@
 from utils import BGRA_CHANNEL_COUNT, WGC_MIN_BUILD, WINDOWS_BUILD_NUMBER, get_direct3d_device, is_valid_hwnd
 
 if TYPE_CHECKING:
-    import cv2.typing
 
     from AutoSplit import AutoSplit
 

src/capture_method/WindowsGraphicsCaptureMethod.py

@@ -1,17 +1,14 @@
 from __future__ import annotations
 
 from math import sqrt
-from typing import TYPE_CHECKING
 
 import cv2
+import cv2.typing
 import imagehash
 from PIL import Image
 
 from utils import BGRA_CHANNEL_COUNT, MAXBYTE, ColorChannel, ImageShape, is_valid_image
 
-if TYPE_CHECKING:
-    import cv2.typing
-
 MAXRANGE = MAXBYTE + 1
 CHANNELS: list[int] = [ColorChannel.Red, ColorChannel.Green, ColorChannel.Blue]
 HISTOGRAM_SIZE = [8, 8, 8]

src/compare.py

@@ -7,6 +7,7 @@
 from typing import TYPE_CHECKING
 
 import cv2
+import cv2.typing
 import numpy as np
 from PySide6 import QtCore, QtGui, QtWidgets
 from PySide6.QtTest import QTest
@@ -31,8 +32,8 @@
 
 user32 = ctypes.windll.user32
 
+
 if TYPE_CHECKING:
-    import cv2.typing
 
     from AutoSplit import AutoSplit