Bump aioelectricitymaps to 0.3.0 (#109399)

* Bump aioelectricitymaps to 0.3.0

* Fix tests

homeassistant/components/co2signal/config_flow.py

@@ -4,8 +4,11 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from aioelectricitymaps import ElectricityMaps
-from aioelectricitymaps.exceptions import ElectricityMapsError, InvalidToken
+from aioelectricitymaps import (
+    ElectricityMaps,
+    ElectricityMapsError,
+    ElectricityMapsInvalidTokenError,
+)
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -146,7 +149,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
             try:
                 await fetch_latest_carbon_intensity(self.hass, em, data)
-            except InvalidToken:
+            except ElectricityMapsInvalidTokenError:
                 errors["base"] = "invalid_auth"
             except ElectricityMapsError:
                 errors["base"] = "unknown"

homeassistant/components/co2signal/coordinator.py

@@ -4,9 +4,12 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-from aioelectricitymaps import ElectricityMaps
-from aioelectricitymaps.exceptions import ElectricityMapsError, InvalidToken
-from aioelectricitymaps.models import CarbonIntensityResponse
+from aioelectricitymaps import (
+    CarbonIntensityResponse,
+    ElectricityMaps,
+    ElectricityMapsError,
+    ElectricityMapsInvalidTokenError,
+)
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -43,7 +46,7 @@ class CO2SignalCoordinator(DataUpdateCoordinator[CarbonIntensityResponse]):
             return await fetch_latest_carbon_intensity(
                 self.hass, self.client, self.config_entry.data
             )
-        except InvalidToken as err:
+        except ElectricityMapsInvalidTokenError as err:
             raise ConfigEntryAuthFailed from err
         except ElectricityMapsError as err:
             raise UpdateFailed(str(err)) from err

homeassistant/components/co2signal/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aioelectricitymaps"],
-  "requirements": ["aioelectricitymaps==0.2.0"]
+  "requirements": ["aioelectricitymaps==0.3.0"]
 }

requirements_all.txt

@@ -233,7 +233,7 @@ aioeagle==1.1.0
 aioecowitt==2023.5.0
 
 # homeassistant.components.co2signal
-aioelectricitymaps==0.2.0
+aioelectricitymaps==0.3.0
 
 # homeassistant.components.emonitor
 aioemonitor==1.0.5

requirements_test_all.txt

@@ -212,7 +212,7 @@ aioeagle==1.1.0
 aioecowitt==2023.5.0
 
 # homeassistant.components.co2signal
-aioelectricitymaps==0.2.0
+aioelectricitymaps==0.3.0
 
 # homeassistant.components.emonitor
 aioemonitor==1.0.5

tests/components/co2signal/test_config_flow.py

@@ -1,10 +1,10 @@
 """Test the CO2 Signal config flow."""
 from unittest.mock import AsyncMock, patch
 
-from aioelectricitymaps.exceptions import (
-    ElectricityMapsDecodeError,
+from aioelectricitymaps import (
+    ElectricityMapsConnectionError,
     ElectricityMapsError,
-    InvalidToken,
+    ElectricityMapsInvalidTokenError,
 )
 import pytest
 
@@ -134,11 +134,11 @@ async def test_form_country(hass: HomeAssistant) -> None:
     ("side_effect", "err_code"),
     [
         (
-            InvalidToken,
+            ElectricityMapsInvalidTokenError,
             "invalid_auth",
         ),
         (ElectricityMapsError("Something else"), "unknown"),
-        (ElectricityMapsDecodeError("Boom"), "unknown"),
+        (ElectricityMapsConnectionError("Boom"), "unknown"),
     ],
     ids=[
         "invalid auth",

tests/components/co2signal/test_sensor.py

@@ -2,10 +2,11 @@
 from datetime import timedelta
 from unittest.mock import AsyncMock
 
-from aioelectricitymaps.exceptions import (
-    ElectricityMapsDecodeError,
+from aioelectricitymaps import (
+    ElectricityMapsConnectionError,
+    ElectricityMapsConnectionTimeoutError,
     ElectricityMapsError,
-    InvalidToken,
+    ElectricityMapsInvalidTokenError,
 )
 from freezegun.api import FrozenDateTimeFactory
 import pytest
@@ -42,7 +43,8 @@ async def test_sensor(
 @pytest.mark.parametrize(
     "error",
     [
-        ElectricityMapsDecodeError,
+        ElectricityMapsConnectionTimeoutError,
+        ElectricityMapsConnectionError,
         ElectricityMapsError,
         Exception,
     ],
@@ -93,8 +95,12 @@ async def test_sensor_reauth_triggered(
     assert (state := hass.states.get("sensor.electricity_maps_co2_intensity"))
     assert state.state == "45.9862319009581"
 
-    electricity_maps.latest_carbon_intensity_by_coordinates.side_effect = InvalidToken
-    electricity_maps.latest_carbon_intensity_by_country_code.side_effect = InvalidToken
+    electricity_maps.latest_carbon_intensity_by_coordinates.side_effect = (
+        ElectricityMapsInvalidTokenError
+    )
+    electricity_maps.latest_carbon_intensity_by_country_code.side_effect = (
+        ElectricityMapsInvalidTokenError
+    )
 
     freezer.tick(timedelta(minutes=20))
     async_fire_time_changed(hass)