diff --git a/homeassistant/components/hydrawise/__init__.py b/homeassistant/components/hydrawise/__init__.py index e09cabb74fc..6d9f2747847 100644 --- a/homeassistant/components/hydrawise/__init__.py +++ b/homeassistant/components/hydrawise/__init__.py @@ -1,7 +1,7 @@ """Support for Hydrawise cloud.""" -from hydrawiser.core import Hydrawiser +from pydrawise.legacy import LegacyHydrawise from requests.exceptions import ConnectTimeout, HTTPError import voluptuous as vol @@ -34,7 +34,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: scan_interval = conf.get(CONF_SCAN_INTERVAL) try: - hydrawise = await hass.async_add_executor_job(Hydrawiser, access_token) + hydrawise = await hass.async_add_executor_job(LegacyHydrawise, access_token) except (ConnectTimeout, HTTPError) as ex: LOGGER.error("Unable to connect to Hydrawise cloud service: %s", str(ex)) _show_failure_notification(hass, str(ex)) diff --git a/homeassistant/components/hydrawise/binary_sensor.py b/homeassistant/components/hydrawise/binary_sensor.py index 2986bbb170e..bc9b8722c58 100644 --- a/homeassistant/components/hydrawise/binary_sensor.py +++ b/homeassistant/components/hydrawise/binary_sensor.py @@ -1,7 +1,7 @@ """Support for Hydrawise sprinkler binary sensors.""" from __future__ import annotations -from hydrawiser.core import Hydrawiser +from pydrawise.legacy import LegacyHydrawise import voluptuous as vol from homeassistant.components.binary_sensor import ( @@ -55,7 +55,7 @@ def setup_platform( ) -> None: """Set up a sensor for a Hydrawise device.""" coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN] - hydrawise: Hydrawiser = coordinator.api + hydrawise: LegacyHydrawise = coordinator.api monitored_conditions = config[CONF_MONITORED_CONDITIONS] entities = [] diff --git a/homeassistant/components/hydrawise/coordinator.py b/homeassistant/components/hydrawise/coordinator.py index ea2e2dd2c4c..007b15d2403 100644 --- a/homeassistant/components/hydrawise/coordinator.py +++ b/homeassistant/components/hydrawise/coordinator.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import timedelta -from hydrawiser.core import Hydrawiser +from pydrawise.legacy import LegacyHydrawise from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed @@ -16,7 +16,7 @@ class HydrawiseDataUpdateCoordinator(DataUpdateCoordinator[None]): """The Hydrawise Data Update Coordinator.""" def __init__( - self, hass: HomeAssistant, api: Hydrawiser, scan_interval: timedelta + self, hass: HomeAssistant, api: LegacyHydrawise, scan_interval: timedelta ) -> None: """Initialize HydrawiseDataUpdateCoordinator.""" super().__init__(hass, LOGGER, name=DOMAIN, update_interval=scan_interval) diff --git a/homeassistant/components/hydrawise/manifest.json b/homeassistant/components/hydrawise/manifest.json index fc88c08b27a..48c9cdcf042 100644 --- a/homeassistant/components/hydrawise/manifest.json +++ b/homeassistant/components/hydrawise/manifest.json @@ -4,6 +4,6 @@ "codeowners": ["@dknowles2", "@ptcryan"], "documentation": "https://www.home-assistant.io/integrations/hydrawise", "iot_class": "cloud_polling", - "loggers": ["hydrawiser"], - "requirements": ["Hydrawiser==0.2"] + "loggers": ["pydrawise"], + "requirements": ["pydrawise==2023.7.0"] } diff --git a/homeassistant/components/hydrawise/sensor.py b/homeassistant/components/hydrawise/sensor.py index d1334143375..9214b9daeac 100644 --- a/homeassistant/components/hydrawise/sensor.py +++ b/homeassistant/components/hydrawise/sensor.py @@ -1,7 +1,7 @@ """Support for Hydrawise sprinkler sensors.""" from __future__ import annotations -from hydrawiser.core import Hydrawiser +from pydrawise.legacy import LegacyHydrawise import voluptuous as vol from homeassistant.components.sensor import ( @@ -57,7 +57,7 @@ def setup_platform( ) -> None: """Set up a sensor for a Hydrawise device.""" coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN] - hydrawise: Hydrawiser = coordinator.api + hydrawise: LegacyHydrawise = coordinator.api monitored_conditions = config[CONF_MONITORED_CONDITIONS] entities = [ diff --git a/homeassistant/components/hydrawise/switch.py b/homeassistant/components/hydrawise/switch.py index 00089bb8774..dbd2c08b28e 100644 --- a/homeassistant/components/hydrawise/switch.py +++ b/homeassistant/components/hydrawise/switch.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any -from hydrawiser.core import Hydrawiser +from pydrawise.legacy import LegacyHydrawise import voluptuous as vol from homeassistant.components.switch import ( @@ -63,7 +63,7 @@ def setup_platform( ) -> None: """Set up a sensor for a Hydrawise device.""" coordinator: HydrawiseDataUpdateCoordinator = hass.data[DOMAIN] - hydrawise: Hydrawiser = coordinator.api + hydrawise: LegacyHydrawise = coordinator.api monitored_conditions: list[str] = config[CONF_MONITORED_CONDITIONS] default_watering_timer: int = config[CONF_WATERING_TIME] diff --git a/requirements_all.txt b/requirements_all.txt index 567b8a96d5c..44d3f4834f8 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -31,9 +31,6 @@ HAP-python==4.7.0 # homeassistant.components.tasmota HATasmota==0.6.5 -# homeassistant.components.hydrawise -Hydrawiser==0.2 - # homeassistant.components.mastodon Mastodon.py==1.5.1 @@ -1638,6 +1635,9 @@ pydiscovergy==1.2.1 # homeassistant.components.doods pydoods==1.0.2 +# homeassistant.components.hydrawise +pydrawise==2023.7.0 + # homeassistant.components.android_ip_webcam pydroid-ipcam==2.0.0