From ad22a114859913494cbbaa879d526a137a604001 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Mon, 6 Nov 2023 14:50:28 +0000 Subject: [PATCH] Update systembridgeconnector to 3.9.4 (#103425) * Update systembridgeconnector to 3.9.2 * Update systembridgeconnector to version 3.9.3 * Update systembridgeconnector to version 3.9.4 * Fix import --- .../components/system_bridge/__init__.py | 8 +++--- .../components/system_bridge/config_flow.py | 4 +-- .../components/system_bridge/coordinator.py | 28 +++++++++---------- .../components/system_bridge/manifest.json | 2 +- .../components/system_bridge/media_player.py | 5 +--- .../components/system_bridge/media_source.py | 4 +-- .../components/system_bridge/notify.py | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- .../system_bridge/test_config_flow.py | 7 +++-- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/homeassistant/components/system_bridge/__init__.py b/homeassistant/components/system_bridge/__init__.py index 843640695e4cf6..9eec64ec5f61b9 100644 --- a/homeassistant/components/system_bridge/__init__.py +++ b/homeassistant/components/system_bridge/__init__.py @@ -9,11 +9,11 @@ ConnectionClosedException, ConnectionErrorException, ) -from systembridgeconnector.models.keyboard_key import KeyboardKey -from systembridgeconnector.models.keyboard_text import KeyboardText -from systembridgeconnector.models.open_path import OpenPath -from systembridgeconnector.models.open_url import OpenUrl from systembridgeconnector.version import SUPPORTED_VERSION, Version +from systembridgemodels.keyboard_key import KeyboardKey +from systembridgemodels.keyboard_text import KeyboardText +from systembridgemodels.open_path import OpenPath +from systembridgemodels.open_url import OpenUrl import voluptuous as vol from homeassistant.config_entries import ConfigEntry diff --git a/homeassistant/components/system_bridge/config_flow.py b/homeassistant/components/system_bridge/config_flow.py index a7dea5d6ab249d..a001f22c9e8470 100644 --- a/homeassistant/components/system_bridge/config_flow.py +++ b/homeassistant/components/system_bridge/config_flow.py @@ -11,9 +11,9 @@ ConnectionClosedException, ConnectionErrorException, ) -from systembridgeconnector.models.get_data import GetData -from systembridgeconnector.models.system import System from systembridgeconnector.websocket_client import WebSocketClient +from systembridgemodels.get_data import GetData +from systembridgemodels.system import System import voluptuous as vol from homeassistant import config_entries, exceptions diff --git a/homeassistant/components/system_bridge/coordinator.py b/homeassistant/components/system_bridge/coordinator.py index a4b016d49bd812..938b7d79b83abb 100644 --- a/homeassistant/components/system_bridge/coordinator.py +++ b/homeassistant/components/system_bridge/coordinator.py @@ -13,21 +13,21 @@ ConnectionClosedException, ConnectionErrorException, ) -from systembridgeconnector.models.battery import Battery -from systembridgeconnector.models.cpu import Cpu -from systembridgeconnector.models.disk import Disk -from systembridgeconnector.models.display import Display -from systembridgeconnector.models.get_data import GetData -from systembridgeconnector.models.gpu import Gpu -from systembridgeconnector.models.media import Media -from systembridgeconnector.models.media_directories import MediaDirectories -from systembridgeconnector.models.media_files import File as MediaFile, MediaFiles -from systembridgeconnector.models.media_get_file import MediaGetFile -from systembridgeconnector.models.media_get_files import MediaGetFiles -from systembridgeconnector.models.memory import Memory -from systembridgeconnector.models.register_data_listener import RegisterDataListener -from systembridgeconnector.models.system import System from systembridgeconnector.websocket_client import WebSocketClient +from systembridgemodels.battery import Battery +from systembridgemodels.cpu import Cpu +from systembridgemodels.disk import Disk +from systembridgemodels.display import Display +from systembridgemodels.get_data import GetData +from systembridgemodels.gpu import Gpu +from systembridgemodels.media import Media +from systembridgemodels.media_directories import MediaDirectories +from systembridgemodels.media_files import File as MediaFile, MediaFiles +from systembridgemodels.media_get_file import MediaGetFile +from systembridgemodels.media_get_files import MediaGetFiles +from systembridgemodels.memory import Memory +from systembridgemodels.register_data_listener import RegisterDataListener +from systembridgemodels.system import System from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( diff --git a/homeassistant/components/system_bridge/manifest.json b/homeassistant/components/system_bridge/manifest.json index 64590ecb96f58e..c0c6ee32869b9b 100644 --- a/homeassistant/components/system_bridge/manifest.json +++ b/homeassistant/components/system_bridge/manifest.json @@ -10,6 +10,6 @@ "iot_class": "local_push", "loggers": ["systembridgeconnector"], "quality_scale": "silver", - "requirements": ["systembridgeconnector==3.8.4"], + "requirements": ["systembridgeconnector==3.9.4"], "zeroconf": ["_system-bridge._tcp.local."] } diff --git a/homeassistant/components/system_bridge/media_player.py b/homeassistant/components/system_bridge/media_player.py index fea0837497d1ca..ea9e8ab070d576 100644 --- a/homeassistant/components/system_bridge/media_player.py +++ b/homeassistant/components/system_bridge/media_player.py @@ -4,10 +4,7 @@ import datetime as dt from typing import Final -from systembridgeconnector.models.media_control import ( - Action as MediaAction, - MediaControl, -) +from systembridgemodels.media_control import Action as MediaAction, MediaControl from homeassistant.components.media_player import ( MediaPlayerDeviceClass, diff --git a/homeassistant/components/system_bridge/media_source.py b/homeassistant/components/system_bridge/media_source.py index 3186d74b15aa47..3423946f63776b 100644 --- a/homeassistant/components/system_bridge/media_source.py +++ b/homeassistant/components/system_bridge/media_source.py @@ -1,8 +1,8 @@ """System Bridge Media Source Implementation.""" from __future__ import annotations -from systembridgeconnector.models.media_directories import MediaDirectories -from systembridgeconnector.models.media_files import File as MediaFile, MediaFiles +from systembridgemodels.media_directories import MediaDirectories +from systembridgemodels.media_files import File as MediaFile, MediaFiles from homeassistant.components.media_player import MediaClass from homeassistant.components.media_source import MEDIA_CLASS_MAP, MEDIA_MIME_TYPES diff --git a/homeassistant/components/system_bridge/notify.py b/homeassistant/components/system_bridge/notify.py index 1ad071bf78f941..f8c00789ae50cd 100644 --- a/homeassistant/components/system_bridge/notify.py +++ b/homeassistant/components/system_bridge/notify.py @@ -4,7 +4,7 @@ import logging from typing import Any -from systembridgeconnector.models.notification import Notification +from systembridgemodels.notification import Notification from homeassistant.components.notify import ( ATTR_DATA, diff --git a/requirements_all.txt b/requirements_all.txt index afadfe86607e86..c88824011bbe89 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2536,7 +2536,7 @@ switchbot-api==1.2.1 synology-srm==0.2.0 # homeassistant.components.system_bridge -systembridgeconnector==3.8.4 +systembridgeconnector==3.9.4 # homeassistant.components.tailscale tailscale==0.6.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 3c4e0bdb52fd87..7d3ab02287b734 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1890,7 +1890,7 @@ surepy==0.8.0 switchbot-api==1.2.1 # homeassistant.components.system_bridge -systembridgeconnector==3.8.4 +systembridgeconnector==3.9.4 # homeassistant.components.tailscale tailscale==0.6.0 diff --git a/tests/components/system_bridge/test_config_flow.py b/tests/components/system_bridge/test_config_flow.py index 56afc87c3bba39..39ecc95d89e574 100644 --- a/tests/components/system_bridge/test_config_flow.py +++ b/tests/components/system_bridge/test_config_flow.py @@ -3,14 +3,15 @@ from ipaddress import ip_address from unittest.mock import patch -from systembridgeconnector.const import MODEL_SYSTEM, TYPE_DATA_UPDATE +from systembridgeconnector.const import TYPE_DATA_UPDATE from systembridgeconnector.exceptions import ( AuthenticationException, ConnectionClosedException, ConnectionErrorException, ) -from systembridgeconnector.models.response import Response -from systembridgeconnector.models.system import LastUpdated, System +from systembridgemodels.const import MODEL_SYSTEM +from systembridgemodels.response import Response +from systembridgemodels.system import LastUpdated, System from homeassistant import config_entries, data_entry_flow from homeassistant.components import zeroconf