diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1f7dbb7f1..2d1ece701 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,8 +23,8 @@ repos: - id: check-executables-have-shebangs stages: [manual] - id: check-json - - repo: https://github.com/pre-commit/mirrors-isort - rev: v4.3.21 + - repo: https://github.com/PyCQA/isort + rev: 5.9.3 hooks: - id: isort - repo: https://github.com/asottile/pyupgrade diff --git a/setup.cfg b/setup.cfg index 6760ecc27..d38d3685c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,9 +4,8 @@ include_trailing_comma=True force_grid_wrap=0 line_length=88 indent = " " -not_skip = __init__.py force_sort_within_sections = true -sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER +sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER default_section = THIRDPARTY forced_separate = tests combine_as_imports = true diff --git a/supervisor/coresys.py b/supervisor/coresys.py index 764c5b056..946154cb2 100644 --- a/supervisor/coresys.py +++ b/supervisor/coresys.py @@ -22,17 +22,18 @@ if TYPE_CHECKING: from .arch import CpuArch from .auth import Auth from .backups.manager import BackupManager + from .bus import Bus from .core import Core from .dbus.manager import DBusManager from .discovery import Discovery from .hardware.manager import HardwareManager - from .os.manager import OSManager from .homeassistant.module import HomeAssistant from .host.manager import HostManager from .ingress import Ingress from .jobs import JobManager from .misc.scheduler import Scheduler from .misc.tasks import Tasks + from .os.manager import OSManager from .plugins.manager import PluginManager from .resolution.module import ResolutionManager from .security import Security @@ -40,7 +41,6 @@ if TYPE_CHECKING: from .store import StoreManager from .supervisor import Supervisor from .updater import Updater - from .bus import Bus T = TypeVar("T")