build: replace dbus_next with dbus_fast

The dbus_next dependency is no longer maintained. Replace it with dbus_fast, which is a fork and drop in compatible. Signed-off-by: Eric Callahan <[email protected]>
Arksine · Jan 12, 2025 · fccffa9 · fccffa9
1 parent 73ad860
commit fccffa9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/moonraker/components/dbus_manager.py b/moonraker/components/dbus_manager.py
@@ -8,9 +8,9 @@
 import asyncio
 import pathlib
 import logging
-import dbus_next
-from dbus_next.aio import MessageBus, ProxyInterface
-from dbus_next.constants import BusType
+import dbus_fast
+from dbus_fast.aio import MessageBus, ProxyInterface
+from dbus_fast.constants import BusType
 
 # Annotation imports
 from typing import (
@@ -30,8 +30,8 @@
 )
 
 class DbusManager:
-    Variant = dbus_next.Variant
-    DbusError = dbus_next.errors.DBusError
+    Variant = dbus_fast.Variant
+    DbusError = dbus_fast.errors.DBusError
     def __init__(self, config: ConfigHelper) -> None:
         self.server = config.get_server()
         self.bus: Optional[MessageBus] = None
@@ -46,8 +46,8 @@ def __init__(self, config: ConfigHelper) -> None:
         self.polkit_subject = [
             "unix-process",
             {
-                "pid": dbus_next.Variant("u", os.getpid()),
-                "start-time": dbus_next.Variant("t", start_clk_ticks)
+                "pid": dbus_fast.Variant("u", os.getpid()),
+                "start-time": dbus_fast.Variant("t", start_clk_ticks)
             }
         ]
 

diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py
@@ -51,8 +51,8 @@
     from .announcements import Announcements
     from .proc_stats import ProcStats
     from .dbus_manager import DbusManager
-    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
     SudoReturn = Union[Awaitable[Tuple[str, bool]], Tuple[str, bool]]
     SudoCallback = Callable[[], SudoReturn]
 

diff --git a/moonraker/components/update_manager/system_deploy.py b/moonraker/components/update_manager/system_deploy.py
@@ -29,8 +29,8 @@
     from ..dbus_manager import DbusManager
     from ..machine import Machine
     from .update_manager import CommandHelper
-    from dbus_next import Variant
-    from dbus_next.aio import ProxyInterface
+    from dbus_fast import Variant
+    from dbus_fast.aio import ProxyInterface
     JsonType = Union[List[Any], Dict[str, Any]]
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,8 @@ dependencies = [
     "zeroconf==0.131.0",
     "preprocess-cancellation==0.2.1",
     "jinja2==3.1.4",
-    "dbus-next==0.2.3",
+    "dbus-fast==2.28.0 ; python_version>='3.9'",
+    "dbus-fast<=2.28.0 ; python_version<'3.9'",
     "apprise==1.8.0",
     "ldap3==2.9.1",
     "python-periphery==2.4.1",

diff --git a/scripts/moonraker-requirements.txt b/scripts/moonraker-requirements.txt
@@ -15,7 +15,8 @@ paho-mqtt==1.6.1
 zeroconf==0.131.0
 preprocess-cancellation==0.2.1
 jinja2==3.1.4
-dbus-next==0.2.3
+dbus-fast==2.28.0 ; python_version>='3.9'
+dbus-fast<=2.28.0 ; python_version<'3.9'
 apprise==1.8.0
 ldap3==2.9.1
 python-periphery==2.4.1