Switch from dbus-next to dbus-fast (#3882)

* Switch to dbus-fast

* dbus-fast==1.6.0

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.6.0

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 (

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 (

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

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

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

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 (

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,

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 (

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

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,

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

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

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 (

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 (

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

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,

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

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
 

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

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
 

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

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

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