diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py index d33e98008d6..f668da25e2e 100644 --- a/homeassistant/components/canary/alarm_control_panel.py +++ b/homeassistant/components/canary/alarm_control_panel.py @@ -3,12 +3,8 @@ from __future__ import annotations from typing import Any -from canary.api import ( - LOCATION_MODE_AWAY, - LOCATION_MODE_HOME, - LOCATION_MODE_NIGHT, - Location, -) +from canary.const import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT +from canary.model import Location from homeassistant.components.alarm_control_panel import ( AlarmControlPanelEntity, diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py index 5caae6f5cc5..44bac9e3bde 100644 --- a/homeassistant/components/canary/camera.py +++ b/homeassistant/components/canary/camera.py @@ -5,8 +5,8 @@ from datetime import timedelta from typing import Final from aiohttp.web import Request, StreamResponse -from canary.api import Device, Location from canary.live_stream_api import LiveStreamSession +from canary.model import Device, Location from haffmpeg.camera import CameraMjpeg import voluptuous as vol diff --git a/homeassistant/components/canary/coordinator.py b/homeassistant/components/canary/coordinator.py index 4c6c9ce5777..b2a8ef4daaa 100644 --- a/homeassistant/components/canary/coordinator.py +++ b/homeassistant/components/canary/coordinator.py @@ -6,7 +6,8 @@ from datetime import timedelta import logging from async_timeout import timeout -from canary.api import Api, Location +from canary.api import Api +from canary.model import Location from requests.exceptions import ConnectTimeout, HTTPError from homeassistant.core import HomeAssistant diff --git a/homeassistant/components/canary/manifest.json b/homeassistant/components/canary/manifest.json index fdae5c83d7b..bf7ceaec273 100644 --- a/homeassistant/components/canary/manifest.json +++ b/homeassistant/components/canary/manifest.json @@ -2,7 +2,7 @@ "domain": "canary", "name": "Canary", "documentation": "https://www.home-assistant.io/integrations/canary", - "requirements": ["py-canary==0.5.2"], + "requirements": ["py-canary==0.5.3"], "dependencies": ["ffmpeg"], "codeowners": [], "config_flow": true, diff --git a/homeassistant/components/canary/model.py b/homeassistant/components/canary/model.py index 848278d9aec..12fb8209108 100644 --- a/homeassistant/components/canary/model.py +++ b/homeassistant/components/canary/model.py @@ -4,7 +4,7 @@ from __future__ import annotations from collections.abc import ValuesView from typing import Optional, TypedDict -from canary.api import Location +from canary.model import Location class CanaryData(TypedDict): diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py index 3de088016a9..c80c178fbb5 100644 --- a/homeassistant/components/canary/sensor.py +++ b/homeassistant/components/canary/sensor.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Final -from canary.api import Device, Location, SensorType +from canary.model import Device, Location, SensorType from homeassistant.components.sensor import SensorDeviceClass, SensorEntity from homeassistant.config_entries import ConfigEntry diff --git a/requirements_all.txt b/requirements_all.txt index ba18173bcac..fc14180138f 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1296,7 +1296,7 @@ pushover_complete==1.1.1 pvo==0.2.2 # homeassistant.components.canary -py-canary==0.5.2 +py-canary==0.5.3 # homeassistant.components.cpuspeed py-cpuinfo==8.0.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 8545067551e..0f3fc63c76f 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -880,7 +880,7 @@ pushbullet.py==0.11.0 pvo==0.2.2 # homeassistant.components.canary -py-canary==0.5.2 +py-canary==0.5.3 # homeassistant.components.cpuspeed py-cpuinfo==8.0.0 diff --git a/tests/components/canary/__init__.py b/tests/components/canary/__init__.py index b327fb0ebcb..46737929dc5 100644 --- a/tests/components/canary/__init__.py +++ b/tests/components/canary/__init__.py @@ -1,7 +1,7 @@ """Tests for the Canary integration.""" from unittest.mock import MagicMock, PropertyMock, patch -from canary.api import SensorType +from canary.model import SensorType from homeassistant.components.canary.const import ( CONF_FFMPEG_ARGUMENTS, diff --git a/tests/components/canary/test_alarm_control_panel.py b/tests/components/canary/test_alarm_control_panel.py index 5034792d389..f6eed94e267 100644 --- a/tests/components/canary/test_alarm_control_panel.py +++ b/tests/components/canary/test_alarm_control_panel.py @@ -1,7 +1,7 @@ """The tests for the Canary alarm_control_panel platform.""" from unittest.mock import PropertyMock, patch -from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT +from canary.const import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN from homeassistant.components.canary import DOMAIN