diff --git a/requirements.txt b/requirements.txt index cfe52ecd1..89534f525 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,4 +22,4 @@ ruamel.yaml==0.17.21 securetar==2022.2.0 sentry-sdk==1.9.8 voluptuous==0.13.1 -dbus-next==0.2.3 +dbus-fast==1.4.0 diff --git a/supervisor/dbus/agent/__init__.py b/supervisor/dbus/agent/__init__.py index bacaf4349..5ac2fe0b1 100644 --- a/supervisor/dbus/agent/__init__.py +++ b/supervisor/dbus/agent/__init__.py @@ -4,7 +4,7 @@ import logging from typing import Any from awesomeversion import AwesomeVersion -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ...exceptions import DBusError, DBusInterfaceError from ..const import ( diff --git a/supervisor/dbus/hostname.py b/supervisor/dbus/hostname.py index 9f2fe0633..91009b616 100644 --- a/supervisor/dbus/hostname.py +++ b/supervisor/dbus/hostname.py @@ -2,7 +2,7 @@ import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from .const import ( diff --git a/supervisor/dbus/interface.py b/supervisor/dbus/interface.py index e3a35d1c7..ddd370d01 100644 --- a/supervisor/dbus/interface.py +++ b/supervisor/dbus/interface.py @@ -3,7 +3,7 @@ from abc import ABC from functools import wraps from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..utils.dbus import DBus from .utils import dbus_connected diff --git a/supervisor/dbus/logind.py b/supervisor/dbus/logind.py index df70d164a..2c6f315ad 100644 --- a/supervisor/dbus/logind.py +++ b/supervisor/dbus/logind.py @@ -1,7 +1,7 @@ """Interface to Logind over D-Bus.""" import logging -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from .const import DBUS_NAME_LOGIND, DBUS_OBJECT_LOGIND diff --git a/supervisor/dbus/manager.py b/supervisor/dbus/manager.py index f14406931..92456ddf8 100644 --- a/supervisor/dbus/manager.py +++ b/supervisor/dbus/manager.py @@ -2,8 +2,8 @@ import asyncio import logging -from dbus_next import BusType -from dbus_next.aio.message_bus import MessageBus +from dbus_fast import BusType +from dbus_fast.aio.message_bus import MessageBus from ..const import SOCKET_DBUS from ..coresys import CoreSys, CoreSysAttributes diff --git a/supervisor/dbus/network/__init__.py b/supervisor/dbus/network/__init__.py index f710ac713..cdc6c2cf4 100644 --- a/supervisor/dbus/network/__init__.py +++ b/supervisor/dbus/network/__init__.py @@ -3,7 +3,7 @@ import logging from typing import Any from awesomeversion import AwesomeVersion, AwesomeVersionException -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus import sentry_sdk from ...exceptions import ( diff --git a/supervisor/dbus/network/dns.py b/supervisor/dbus/network/dns.py index 327587730..e93c0ecda 100644 --- a/supervisor/dbus/network/dns.py +++ b/supervisor/dbus/network/dns.py @@ -3,7 +3,7 @@ from ipaddress import ip_address import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ...const import ( ATTR_DOMAINS, diff --git a/supervisor/dbus/network/interface.py b/supervisor/dbus/network/interface.py index b9943b2fe..6269498c8 100644 --- a/supervisor/dbus/network/interface.py +++ b/supervisor/dbus/network/interface.py @@ -2,7 +2,7 @@ from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ...utils.dbus import DBus from ..const import ( diff --git a/supervisor/dbus/network/setting/__init__.py b/supervisor/dbus/network/setting/__init__.py index d49b201bc..240d7e44f 100644 --- a/supervisor/dbus/network/setting/__init__.py +++ b/supervisor/dbus/network/setting/__init__.py @@ -2,7 +2,7 @@ import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ....const import ATTR_METHOD, ATTR_MODE, ATTR_PSK, ATTR_SSID from ...const import DBUS_NAME_NM diff --git a/supervisor/dbus/network/setting/generate.py b/supervisor/dbus/network/setting/generate.py index 87f9f1f80..30a2c4706 100644 --- a/supervisor/dbus/network/setting/generate.py +++ b/supervisor/dbus/network/setting/generate.py @@ -5,7 +5,7 @@ import socket from typing import TYPE_CHECKING, Any from uuid import uuid4 -from dbus_next.signature import Variant +from dbus_fast.signature import Variant from . import ( ATTR_ASSIGNED_MAC, diff --git a/supervisor/dbus/network/settings.py b/supervisor/dbus/network/settings.py index 558af3579..bba1f1176 100644 --- a/supervisor/dbus/network/settings.py +++ b/supervisor/dbus/network/settings.py @@ -2,7 +2,7 @@ import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ...exceptions import DBusError, DBusInterfaceError from ..const import DBUS_NAME_NM, DBUS_OBJECT_SETTINGS diff --git a/supervisor/dbus/rauc.py b/supervisor/dbus/rauc.py index f38ee3a95..8591c117b 100644 --- a/supervisor/dbus/rauc.py +++ b/supervisor/dbus/rauc.py @@ -2,7 +2,7 @@ import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from ..utils.dbus import DBusSignalWrapper diff --git a/supervisor/dbus/resolved.py b/supervisor/dbus/resolved.py index 09f9313aa..34deb6cf3 100644 --- a/supervisor/dbus/resolved.py +++ b/supervisor/dbus/resolved.py @@ -4,7 +4,7 @@ from __future__ import annotations import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from .const import ( diff --git a/supervisor/dbus/systemd.py b/supervisor/dbus/systemd.py index 5e5416d80..b5cba172a 100644 --- a/supervisor/dbus/systemd.py +++ b/supervisor/dbus/systemd.py @@ -2,7 +2,7 @@ import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from .const import ( diff --git a/supervisor/dbus/timedate.py b/supervisor/dbus/timedate.py index 56c04adc1..3249d7434 100644 --- a/supervisor/dbus/timedate.py +++ b/supervisor/dbus/timedate.py @@ -3,7 +3,7 @@ from datetime import datetime import logging from typing import Any -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from ..exceptions import DBusError, DBusInterfaceError from ..utils.dt import utc_from_timestamp diff --git a/supervisor/utils/dbus.py b/supervisor/utils/dbus.py index 66178d64e..fdfff36e7 100644 --- a/supervisor/utils/dbus.py +++ b/supervisor/utils/dbus.py @@ -5,12 +5,12 @@ import asyncio import logging from typing import Any, Awaitable, Callable, Coroutine -from dbus_next import ErrorType, InvalidIntrospectionError, Message, MessageType -from dbus_next.aio.message_bus import MessageBus -from dbus_next.aio.proxy_object import ProxyInterface, ProxyObject -from dbus_next.errors import DBusError -from dbus_next.introspection import Node -from dbus_next.signature import Variant +from dbus_fast import ErrorType, InvalidIntrospectionError, Message, MessageType +from dbus_fast.aio.message_bus import MessageBus +from dbus_fast.aio.proxy_object import ProxyInterface, ProxyObject +from dbus_fast.errors import DBusError +from dbus_fast.introspection import Node +from dbus_fast.signature import Variant from ..exceptions import ( DBusFatalError, diff --git a/tests/common.py b/tests/common.py index 9ef8f70fd..79dad61c4 100644 --- a/tests/common.py +++ b/tests/common.py @@ -4,7 +4,7 @@ import json from pathlib import Path from typing import Any -from dbus_next.introspection import Method, Property, Signal +from dbus_fast.introspection import Method, Property, Signal from supervisor.dbus.interface import DBusInterface, DBusInterfaceProxy from supervisor.utils.dbus import DBUS_INTERFACE_PROPERTIES diff --git a/tests/conftest.py b/tests/conftest.py index e533b73d1..823b436d5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,8 +8,8 @@ from uuid import uuid4 from aiohttp import web from awesomeversion import AwesomeVersion -from dbus_next.aio.message_bus import MessageBus -from dbus_next.aio.proxy_object import ProxyInterface, ProxyObject +from dbus_fast.aio.message_bus import MessageBus +from dbus_fast.aio.proxy_object import ProxyInterface, ProxyObject import pytest from securetar import SecureTarFile diff --git a/tests/dbus/network/setting/test_init.py b/tests/dbus/network/setting/test_init.py index 434240251..2744f5ac5 100644 --- a/tests/dbus/network/setting/test_init.py +++ b/tests/dbus/network/setting/test_init.py @@ -3,8 +3,8 @@ import asyncio from typing import Any from unittest.mock import patch -from dbus_next.aio.proxy_object import ProxyInterface -from dbus_next.signature import Variant +from dbus_fast.aio.proxy_object import ProxyInterface +from dbus_fast.signature import Variant from supervisor.coresys import CoreSys from supervisor.dbus.network.setting.generate import get_connection_from_interface diff --git a/tests/dbus/network/test_accesspoint.py b/tests/dbus/network/test_accesspoint.py index 8fac191dc..8688aa662 100644 --- a/tests/dbus/network/test_accesspoint.py +++ b/tests/dbus/network/test_accesspoint.py @@ -1,5 +1,5 @@ """Test NetworkWireless AP object.""" -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus from supervisor.dbus.network.accesspoint import NetworkWirelessAP diff --git a/tests/dbus/test_interface.py b/tests/dbus/test_interface.py index 4a87de457..612ce1c3d 100644 --- a/tests/dbus/test_interface.py +++ b/tests/dbus/test_interface.py @@ -4,7 +4,7 @@ import asyncio from dataclasses import dataclass from unittest.mock import MagicMock -from dbus_next.aio.message_bus import MessageBus +from dbus_fast.aio.message_bus import MessageBus import pytest from supervisor.dbus.interface import DBusInterface, DBusInterfaceProxy diff --git a/tests/host/test_network.py b/tests/host/test_network.py index 7e7ddffec..1c00b1ba6 100644 --- a/tests/host/test_network.py +++ b/tests/host/test_network.py @@ -3,7 +3,7 @@ import asyncio from ipaddress import IPv4Address, IPv6Address from unittest.mock import Mock, PropertyMock, patch -from dbus_next.aio.proxy_object import ProxyInterface +from dbus_fast.aio.proxy_object import ProxyInterface import pytest from supervisor.const import CoreState diff --git a/tests/utils/test_dbus.py b/tests/utils/test_dbus.py index 2abb7a3ba..3cb3806c0 100644 --- a/tests/utils/test_dbus.py +++ b/tests/utils/test_dbus.py @@ -1,5 +1,5 @@ """Check dbus-next implementation.""" -from dbus_next.signature import Variant +from dbus_fast.signature import Variant from supervisor.utils.dbus import DBus