From f0d5640f5ddde7a181938fe4e8944fa540b2b9b7 Mon Sep 17 00:00:00 2001 From: "Mr. Bubbles" Date: Sun, 23 Jun 2024 04:22:13 +0200 Subject: [PATCH] Bump pyloadapi to v1.2.0 (#120218) --- homeassistant/components/pyload/manifest.json | 2 +- homeassistant/components/pyload/sensor.py | 14 +++++++++----- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/pyload/conftest.py | 6 ++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/homeassistant/components/pyload/manifest.json b/homeassistant/components/pyload/manifest.json index 90d750ff9b8..2a6e54fdf54 100644 --- a/homeassistant/components/pyload/manifest.json +++ b/homeassistant/components/pyload/manifest.json @@ -6,5 +6,5 @@ "integration_type": "service", "iot_class": "local_polling", "loggers": ["pyloadapi"], - "requirements": ["PyLoadAPI==1.1.0"] + "requirements": ["PyLoadAPI==1.2.0"] } diff --git a/homeassistant/components/pyload/sensor.py b/homeassistant/components/pyload/sensor.py index a005f848c37..a0420db819c 100644 --- a/homeassistant/components/pyload/sensor.py +++ b/homeassistant/components/pyload/sensor.py @@ -6,11 +6,15 @@ from datetime import timedelta from enum import StrEnum import logging from time import monotonic -from typing import Any from aiohttp import CookieJar -from pyloadapi.api import PyLoadAPI -from pyloadapi.exceptions import CannotConnect, InvalidAuth, ParserError +from pyloadapi import ( + CannotConnect, + InvalidAuth, + ParserError, + PyLoadAPI, + StatusServerResponse, +) import voluptuous as vol from homeassistant.components.sensor import ( @@ -132,7 +136,7 @@ class PyLoadSensor(SensorEntity): self.api = api self.entity_description = entity_description self._attr_available = False - self.data: dict[str, Any] = {} + self.data: StatusServerResponse async def async_update(self) -> None: """Update state of sensor.""" @@ -167,7 +171,7 @@ class PyLoadSensor(SensorEntity): self._attr_available = False return else: - self.data = status.to_dict() + self.data = status _LOGGER.debug( "Finished fetching pyload data in %.3f seconds", monotonic() - start, diff --git a/requirements_all.txt b/requirements_all.txt index 2343fa9bd4e..a1ce60412ba 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -60,7 +60,7 @@ PyFlume==0.6.5 PyFronius==0.7.3 # homeassistant.components.pyload -PyLoadAPI==1.1.0 +PyLoadAPI==1.2.0 # homeassistant.components.mvglive PyMVGLive==1.1.4 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index fdd67cf9e29..7e1316c8b74 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -51,7 +51,7 @@ PyFlume==0.6.5 PyFronius==0.7.3 # homeassistant.components.pyload -PyLoadAPI==1.1.0 +PyLoadAPI==1.2.0 # homeassistant.components.met_eireann PyMetEireann==2021.8.0 diff --git a/tests/components/pyload/conftest.py b/tests/components/pyload/conftest.py index 67694bcb4b9..53e86639c4a 100644 --- a/tests/components/pyload/conftest.py +++ b/tests/components/pyload/conftest.py @@ -47,7 +47,7 @@ def mock_pyloadapi() -> Generator[AsyncMock, None, None]: ): client = mock_client.return_value client.username = "username" - client.login.return_value = LoginResponse.from_dict( + client.login.return_value = LoginResponse( { "_permanent": True, "authenticated": True, @@ -59,7 +59,8 @@ def mock_pyloadapi() -> Generator[AsyncMock, None, None]: "_flashes": [["message", "Logged in successfully"]], } ) - client.get_status.return_value = StatusServerResponse.from_dict( + + client.get_status.return_value = StatusServerResponse( { "pause": False, "active": 1, @@ -71,5 +72,6 @@ def mock_pyloadapi() -> Generator[AsyncMock, None, None]: "captcha": False, } ) + client.free_space.return_value = 99999999999 yield client