Skip to content

Commit

Permalink
Merge branch 'sync-Ruff-configs-with-Beslogic/shared-configs' of http…
Browse files Browse the repository at this point in the history
…s://github.com/Toufool/AutoSplit into sync-Ruff-configs-with-Beslogic/shared-configs
  • Loading branch information
Avasam committed Aug 18, 2024
2 parents 53fc598 + 8d77bad commit c8cff10
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/AutoSplit.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import cv2
from cv2.typing import MatLike
from gen import about, design, settings, update_checker
from psutil import process_iter
from PySide6 import QtCore, QtGui
from PySide6.QtTest import QTest
Expand All @@ -44,7 +45,6 @@
from AutoControlledThread import AutoControlledThread
from AutoSplitImage import START_KEYWORD, AutoSplitImage, ImageType
from capture_method import CaptureMethodBase, CaptureMethodEnum
from gen import about, design, settings, update_checker
from hotkeys import (
HOTKEYS,
KEYBOARD_GROUPS_ISSUE,
Expand Down
2 changes: 1 addition & 1 deletion src/menu_bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from urllib.error import URLError
from urllib.request import urlopen

from gen import about, design, settings as settings_ui, update_checker
from packaging.version import parse as version_parse
from PySide6 import QtCore, QtWidgets
from PySide6.QtCore import Qt
Expand All @@ -22,7 +23,6 @@
change_capture_method,
get_all_video_capture_devices,
)
from gen import about, design, settings as settings_ui, update_checker
from hotkeys import HOTKEYS, HOTKEYS_WHEN_AUTOCONTROLLED, set_hotkey
from utils import AUTOSPLIT_VERSION, GITHUB_REPOSITORY, ONE_SECOND, decimal, fire_and_forget

Expand Down
2 changes: 1 addition & 1 deletion src/user_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
from typing import TYPE_CHECKING, TypedDict, cast

import toml
from gen import design
from PySide6 import QtCore, QtWidgets
from typing_extensions import deprecated, override

import error_messages
from capture_method import CAPTURE_METHODS, CaptureMethodEnum, Region, change_capture_method
from gen import design
from hotkeys import HOTKEYS, Hotkey, remove_all_hotkeys, set_hotkey
from menu_bar import open_settings
from utils import auto_split_directory
Expand Down
1 change: 0 additions & 1 deletion src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import cv2
import numpy as np
from cv2.typing import MatLike

from gen.build_vars import AUTOSPLIT_BUILD_NUMBER, AUTOSPLIT_GITHUB_REPOSITORY

if sys.platform == "win32":
Expand Down

0 comments on commit c8cff10

Please sign in to comment.