From 3f2d2a85b7fb238ad2f2de5f2d349901e9c157ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 25 Aug 2023 12:53:26 +0200 Subject: [PATCH] Update AEMET-OpenData to v0.4.0 (#99015) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update AEMET-OpenData to v0.4.0 Signed-off-by: Álvaro Fernández Rojas * Trigger Github CI --------- Signed-off-by: Álvaro Fernández Rojas --- homeassistant/components/aemet/__init__.py | 5 +++-- homeassistant/components/aemet/config_flow.py | 8 +++----- homeassistant/components/aemet/manifest.json | 2 +- .../components/aemet/weather_update_coordinator.py | 4 ++-- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/aemet/__init__.py b/homeassistant/components/aemet/__init__.py index 68e7bb6c5e0..772dcd0276b 100644 --- a/homeassistant/components/aemet/__init__.py +++ b/homeassistant/components/aemet/__init__.py @@ -1,7 +1,7 @@ """The AEMET OpenData component.""" import logging -from aemet_opendata.interface import AEMET +from aemet_opendata.interface import AEMET, ConnectionOptions from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME @@ -28,7 +28,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: longitude = entry.data[CONF_LONGITUDE] station_updates = entry.options.get(CONF_STATION_UPDATES, True) - aemet = AEMET(aiohttp_client.async_get_clientsession(hass), api_key) + options = ConnectionOptions(api_key, station_updates) + aemet = AEMET(aiohttp_client.async_get_clientsession(hass), options) weather_coordinator = WeatherUpdateCoordinator( hass, aemet, latitude, longitude, station_updates ) diff --git a/homeassistant/components/aemet/config_flow.py b/homeassistant/components/aemet/config_flow.py index 129f513025a..4f3531b19e7 100644 --- a/homeassistant/components/aemet/config_flow.py +++ b/homeassistant/components/aemet/config_flow.py @@ -1,8 +1,8 @@ """Config flow for AEMET OpenData.""" from __future__ import annotations -from aemet_opendata import AEMET from aemet_opendata.exceptions import AuthError +from aemet_opendata.interface import AEMET, ConnectionOptions import voluptuous as vol from homeassistant import config_entries @@ -40,10 +40,8 @@ class AemetConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): await self.async_set_unique_id(f"{latitude}-{longitude}") self._abort_if_unique_id_configured() - aemet = AEMET( - aiohttp_client.async_get_clientsession(self.hass), - user_input[CONF_API_KEY], - ) + options = ConnectionOptions(user_input[CONF_API_KEY], False) + aemet = AEMET(aiohttp_client.async_get_clientsession(self.hass), options) try: await aemet.get_conventional_observation_stations(False) except AuthError: diff --git a/homeassistant/components/aemet/manifest.json b/homeassistant/components/aemet/manifest.json index a460d9e16bc..4d1b25908ef 100644 --- a/homeassistant/components/aemet/manifest.json +++ b/homeassistant/components/aemet/manifest.json @@ -6,5 +6,5 @@ "documentation": "https://www.home-assistant.io/integrations/aemet", "iot_class": "cloud_polling", "loggers": ["aemet_opendata"], - "requirements": ["AEMET-OpenData==0.3.0"] + "requirements": ["AEMET-OpenData==0.4.0"] } diff --git a/homeassistant/components/aemet/weather_update_coordinator.py b/homeassistant/components/aemet/weather_update_coordinator.py index d44160116f2..66a1a2eb891 100644 --- a/homeassistant/components/aemet/weather_update_coordinator.py +++ b/homeassistant/components/aemet/weather_update_coordinator.py @@ -11,6 +11,7 @@ from aemet_opendata.const import ( AEMET_ATTR_DAY, AEMET_ATTR_DIRECTION, AEMET_ATTR_ELABORATED, + AEMET_ATTR_FEEL_TEMPERATURE, AEMET_ATTR_FORECAST, AEMET_ATTR_HUMIDITY, AEMET_ATTR_ID, @@ -32,7 +33,6 @@ from aemet_opendata.const import ( AEMET_ATTR_STATION_TEMPERATURE, AEMET_ATTR_STORM_PROBABILITY, AEMET_ATTR_TEMPERATURE, - AEMET_ATTR_TEMPERATURE_FEELING, AEMET_ATTR_WIND, AEMET_ATTR_WIND_GUST, ATTR_DATA, @@ -563,7 +563,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator): @staticmethod def _get_temperature_feeling(day_data, hour): """Get temperature from weather data.""" - val = get_forecast_hour_value(day_data[AEMET_ATTR_TEMPERATURE_FEELING], hour) + val = get_forecast_hour_value(day_data[AEMET_ATTR_FEEL_TEMPERATURE], hour) return format_int(val) def _get_town_id(self): diff --git a/requirements_all.txt b/requirements_all.txt index 2aaba30788b..b915a38368f 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,7 +2,7 @@ -r requirements.txt # homeassistant.components.aemet -AEMET-OpenData==0.3.0 +AEMET-OpenData==0.4.0 # homeassistant.components.aladdin_connect AIOAladdinConnect==0.1.57 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 752e320aa93..a292cfb78ac 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -4,7 +4,7 @@ -r requirements_test.txt # homeassistant.components.aemet -AEMET-OpenData==0.3.0 +AEMET-OpenData==0.4.0 # homeassistant.components.aladdin_connect AIOAladdinConnect==0.1.57