From cb0517d20e2d03c5d8836d3e0fd9b317e71f5702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 30 Oct 2023 18:54:50 +0100 Subject: [PATCH] Update AEMET-OpenData to v0.4.6 (#102996) --- homeassistant/components/aemet/__init__.py | 7 +++---- homeassistant/components/aemet/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/aemet/test_init.py | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/aemet/__init__.py b/homeassistant/components/aemet/__init__.py index 13e636b2196..843693d2dc3 100644 --- a/homeassistant/components/aemet/__init__.py +++ b/homeassistant/components/aemet/__init__.py @@ -1,9 +1,8 @@ """The AEMET OpenData component.""" -import asyncio import logging -from aemet_opendata.exceptions import TownNotFound +from aemet_opendata.exceptions import AemetError, TownNotFound from aemet_opendata.interface import AEMET, ConnectionOptions from homeassistant.config_entries import ConfigEntry @@ -39,8 +38,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: except TownNotFound as err: _LOGGER.error(err) return False - except asyncio.TimeoutError as err: - raise ConfigEntryNotReady("AEMET OpenData API timed out") from err + except AemetError as err: + raise ConfigEntryNotReady(err) from err weather_coordinator = WeatherUpdateCoordinator(hass, aemet) await weather_coordinator.async_config_entry_first_refresh() diff --git a/homeassistant/components/aemet/manifest.json b/homeassistant/components/aemet/manifest.json index 74d53cc117a..544931b50b5 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.4.5"] + "requirements": ["AEMET-OpenData==0.4.6"] } diff --git a/requirements_all.txt b/requirements_all.txt index 81c225408bd..aa9a1567d9c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2,7 +2,7 @@ -r requirements.txt # homeassistant.components.aemet -AEMET-OpenData==0.4.5 +AEMET-OpenData==0.4.6 # homeassistant.components.aladdin_connect AIOAladdinConnect==0.1.58 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index ea4413813ab..d8885ba51b7 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.4.5 +AEMET-OpenData==0.4.6 # homeassistant.components.aladdin_connect AIOAladdinConnect==0.1.58 diff --git a/tests/components/aemet/test_init.py b/tests/components/aemet/test_init.py index 9389acf07c9..7a4f73dc62b 100644 --- a/tests/components/aemet/test_init.py +++ b/tests/components/aemet/test_init.py @@ -1,7 +1,7 @@ """Define tests for the AEMET OpenData init.""" -import asyncio from unittest.mock import patch +from aemet_opendata.exceptions import AemetTimeout from freezegun.api import FrozenDateTimeFactory from homeassistant.components.aemet.const import DOMAIN @@ -83,7 +83,7 @@ async def test_init_api_timeout( freezer.move_to("2021-01-09 12:00:00+00:00") with patch( "homeassistant.components.aemet.AEMET.api_call", - side_effect=asyncio.TimeoutError, + side_effect=AemetTimeout, ): config_entry = MockConfigEntry( domain=DOMAIN,