Upgrades Garages Amsterdam to v3.0.0 (#61734)

homeassistant/components/garages_amsterdam/__init__.py

@@ -3,7 +3,7 @@ from datetime import timedelta
 import logging
 
 import async_timeout
-import garages_amsterdam
+from garages_amsterdam import GaragesAmsterdam
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
@@ -43,9 +43,9 @@ async def get_coordinator(
         async with async_timeout.timeout(10):
             return {
                 garage.garage_name: garage
-                for garage in await garages_amsterdam.get_garages(
-                    aiohttp_client.async_get_clientsession(hass)
-                )
+                for garage in await GaragesAmsterdam(
+                    session=aiohttp_client.async_get_clientsession(hass)
+                ).all_garages()
             }
 
     coordinator = DataUpdateCoordinator(

homeassistant/components/garages_amsterdam/config_flow.py

@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from aiohttp import ClientResponseError
-import garages_amsterdam
+from garages_amsterdam import GaragesAmsterdam
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -30,9 +30,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         if self._options is None:
             self._options = []
             try:
-                api_data = await garages_amsterdam.get_garages(
-                    aiohttp_client.async_get_clientsession(self.hass)
-                )
+                api_data = await GaragesAmsterdam(
+                    session=aiohttp_client.async_get_clientsession(self.hass)
+                ).all_garages()
             except ClientResponseError:
                 _LOGGER.error("Unexpected response from server")
                 return self.async_abort(reason="cannot_connect")

homeassistant/components/garages_amsterdam/manifest.json

@@ -3,7 +3,7 @@
   "name": "Garages Amsterdam",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/garages_amsterdam",
-  "requirements": ["garages-amsterdam==2.1.1"],
+  "requirements": ["garages-amsterdam==3.0.0"],
   "codeowners": ["@klaasnicolaas"],
   "iot_class": "cloud_polling"
 }

requirements_all.txt

@@ -695,7 +695,7 @@ fritzconnection==1.7.2
 gTTS==2.2.3
 
 # homeassistant.components.garages_amsterdam
-garages-amsterdam==2.1.1
+garages-amsterdam==3.0.0
 
 # homeassistant.components.geniushub
 geniushub-client==0.6.30

requirements_test_all.txt

@@ -430,7 +430,7 @@ fritzconnection==1.7.2
 gTTS==2.2.3
 
 # homeassistant.components.garages_amsterdam
-garages-amsterdam==2.1.1
+garages-amsterdam==3.0.0
 
 # homeassistant.components.geo_json_events
 # homeassistant.components.usgs_earthquakes_feed

tests/components/garages_amsterdam/conftest.py

@@ -9,7 +9,7 @@ import pytest
 def mock_cases():
     """Mock garages_amsterdam garages."""
     with patch(
-        "garages_amsterdam.get_garages",
+        "garages_amsterdam.GaragesAmsterdam.all_garages",
         return_value=[
             Mock(
                 garage_name="IJDok",

tests/components/garages_amsterdam/test_config_flow.py

@@ -57,7 +57,7 @@ async def test_error_handling(
     """Test we get the form."""
 
     with patch(
-        "homeassistant.components.garages_amsterdam.config_flow.garages_amsterdam.get_garages",
+        "homeassistant.components.garages_amsterdam.config_flow.GaragesAmsterdam.all_garages",
         side_effect=side_effect,
     ):
         result = await hass.config_entries.flow.async_init(