From 66b3dacd4c4e7703f9c70376886d141bc5200e5d Mon Sep 17 00:00:00 2001 From: Jules Dejaeghere Date: Sat, 10 May 2025 23:18:41 +0200 Subject: [PATCH] Reformat imports with ruff --- custom_components/irm_kmi/__init__.py | 13 ++++++--- custom_components/irm_kmi/binary_sensor.py | 6 +++-- custom_components/irm_kmi/camera.py | 2 +- custom_components/irm_kmi/config_flow.py | 26 +++++++++++------- custom_components/irm_kmi/const.py | 31 +++++++++++++--------- custom_components/irm_kmi/coordinator.py | 22 ++++++++++++--- custom_components/irm_kmi/data.py | 2 +- custom_components/irm_kmi/repairs.py | 10 +++++-- custom_components/irm_kmi/sensor.py | 13 ++++++--- custom_components/irm_kmi/weather.py | 17 ++++++++---- tests/conftest.py | 22 ++++++++++----- tests/test_config_flow.py | 8 ++++-- tests/test_current_weather_sensors.py | 8 +++--- tests/test_init.py | 8 ++++-- tests/test_repairs.py | 16 ++++++----- tests/test_sensors.py | 3 +-- tests/test_weather.py | 7 +++-- 17 files changed, 146 insertions(+), 68 deletions(-) diff --git a/custom_components/irm_kmi/__init__.py b/custom_components/irm_kmi/__init__.py index 9163b52..a90baec 100644 --- a/custom_components/irm_kmi/__init__.py +++ b/custom_components/irm_kmi/__init__.py @@ -8,9 +8,16 @@ from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryError from irm_kmi_api import RadarStyle -from .const import (CONF_DARK_MODE, CONF_LANGUAGE_OVERRIDE, CONF_STYLE, - CONFIG_FLOW_VERSION, DOMAIN, PLATFORMS, CONF_USE_DEPRECATED_FORECAST, - OPTION_DEPRECATED_FORECAST_NOT_USED) +from .const import ( + CONF_DARK_MODE, + CONF_LANGUAGE_OVERRIDE, + CONF_STYLE, + CONF_USE_DEPRECATED_FORECAST, + CONFIG_FLOW_VERSION, + DOMAIN, + OPTION_DEPRECATED_FORECAST_NOT_USED, + PLATFORMS, +) from .coordinator import IrmKmiCoordinator _LOGGER = logging.getLogger(__name__) diff --git a/custom_components/irm_kmi/binary_sensor.py b/custom_components/irm_kmi/binary_sensor.py index 36d3264..65163e0 100644 --- a/custom_components/irm_kmi/binary_sensor.py +++ b/custom_components/irm_kmi/binary_sensor.py @@ -2,8 +2,10 @@ import logging from homeassistant.components import binary_sensor -from homeassistant.components.binary_sensor import (BinarySensorDeviceClass, - BinarySensorEntity) +from homeassistant.components.binary_sensor import ( + BinarySensorDeviceClass, + BinarySensorEntity, +) from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback diff --git a/custom_components/irm_kmi/camera.py b/custom_components/irm_kmi/camera.py index ad5306b..2484f59 100644 --- a/custom_components/irm_kmi/camera.py +++ b/custom_components/irm_kmi/camera.py @@ -9,8 +9,8 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from .coordinator import IrmKmiCoordinator from .const import DOMAIN +from .coordinator import IrmKmiCoordinator _LOGGER = logging.getLogger(__name__) diff --git a/custom_components/irm_kmi/config_flow.py b/custom_components/irm_kmi/config_flow.py index b5807c1..db18e1c 100644 --- a/custom_components/irm_kmi/config_flow.py +++ b/custom_components/irm_kmi/config_flow.py @@ -9,17 +9,25 @@ from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, CONF_ZONE from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import async_get_clientsession -from homeassistant.helpers.selector import (EntitySelector, - EntitySelectorConfig, - SelectSelector, - SelectSelectorConfig, - SelectSelectorMode) +from homeassistant.helpers.selector import ( + EntitySelector, + EntitySelectorConfig, + SelectSelector, + SelectSelectorConfig, + SelectSelectorMode, +) from irm_kmi_api import IrmKmiApiClient, RadarStyle -from .const import (CONF_DARK_MODE, CONF_LANGUAGE_OVERRIDE, - CONF_LANGUAGE_OVERRIDE_OPTIONS, CONF_STYLE, - CONFIG_FLOW_VERSION, DOMAIN, - OUT_OF_BENELUX, USER_AGENT) +from .const import ( + CONF_DARK_MODE, + CONF_LANGUAGE_OVERRIDE, + CONF_LANGUAGE_OVERRIDE_OPTIONS, + CONF_STYLE, + CONFIG_FLOW_VERSION, + DOMAIN, + OUT_OF_BENELUX, + USER_AGENT, +) from .utils import get_config_value _LOGGER = logging.getLogger(__name__) diff --git a/custom_components/irm_kmi/const.py b/custom_components/irm_kmi/const.py index e7a3c6b..95d6a3f 100644 --- a/custom_components/irm_kmi/const.py +++ b/custom_components/irm_kmi/const.py @@ -2,18 +2,25 @@ from typing import Final from homeassistant.components.sensor import SensorDeviceClass -from homeassistant.components.weather import (ATTR_CONDITION_CLEAR_NIGHT, - ATTR_CONDITION_CLOUDY, - ATTR_CONDITION_FOG, - ATTR_CONDITION_LIGHTNING_RAINY, - ATTR_CONDITION_PARTLYCLOUDY, - ATTR_CONDITION_POURING, - ATTR_CONDITION_RAINY, - ATTR_CONDITION_SNOWY, - ATTR_CONDITION_SNOWY_RAINY, - ATTR_CONDITION_SUNNY) -from homeassistant.const import (DEGREE, Platform, UnitOfPressure, UnitOfSpeed, - UnitOfTemperature) +from homeassistant.components.weather import ( + ATTR_CONDITION_CLEAR_NIGHT, + ATTR_CONDITION_CLOUDY, + ATTR_CONDITION_FOG, + ATTR_CONDITION_LIGHTNING_RAINY, + ATTR_CONDITION_PARTLYCLOUDY, + ATTR_CONDITION_POURING, + ATTR_CONDITION_RAINY, + ATTR_CONDITION_SNOWY, + ATTR_CONDITION_SNOWY_RAINY, + ATTR_CONDITION_SUNNY, +) +from homeassistant.const import ( + DEGREE, + Platform, + UnitOfPressure, + UnitOfSpeed, + UnitOfTemperature, +) from irm_kmi_api import PollenName DOMAIN: Final = 'irm_kmi' diff --git a/custom_components/irm_kmi/coordinator.py b/custom_components/irm_kmi/coordinator.py index a67458b..6ea1367 100644 --- a/custom_components/irm_kmi/coordinator.py +++ b/custom_components/irm_kmi/coordinator.py @@ -10,14 +10,28 @@ from homeassistant.helpers import issue_registry from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.update_coordinator import ( - TimestampDataUpdateCoordinator, UpdateFailed) + TimestampDataUpdateCoordinator, + UpdateFailed, +) from homeassistant.util import dt from homeassistant.util.dt import utcnow -from irm_kmi_api import IrmKmiApiClientHa, IrmKmiApiError, PollenParser, RainGraph, RadarStyle +from irm_kmi_api import ( + IrmKmiApiClientHa, + IrmKmiApiError, + PollenParser, + RadarStyle, + RainGraph, +) -from .const import CONF_DARK_MODE, CONF_STYLE, DOMAIN, IRM_KMI_NAME +from .const import ( + CONF_DARK_MODE, + CONF_STYLE, + DOMAIN, + IRM_KMI_NAME, + OUT_OF_BENELUX, + USER_AGENT, +) from .const import IRM_KMI_TO_HA_CONDITION_MAP as CDT_MAP -from .const import OUT_OF_BENELUX, USER_AGENT from .data import ProcessedCoordinatorData from .utils import disable_from_config, get_config_value, preferred_language diff --git a/custom_components/irm_kmi/data.py b/custom_components/irm_kmi/data.py index 1fe7958..c905940 100644 --- a/custom_components/irm_kmi/data.py +++ b/custom_components/irm_kmi/data.py @@ -1,7 +1,7 @@ from typing import List, TypedDict from homeassistant.components.weather import Forecast -from irm_kmi_api import CurrentWeatherData, ExtendedForecast, WarningData, RainGraph +from irm_kmi_api import CurrentWeatherData, ExtendedForecast, RainGraph, WarningData class ProcessedCoordinatorData(TypedDict, total=False): diff --git a/custom_components/irm_kmi/repairs.py b/custom_components/irm_kmi/repairs.py index fe1d9a8..c6fd40d 100644 --- a/custom_components/irm_kmi/repairs.py +++ b/custom_components/irm_kmi/repairs.py @@ -11,8 +11,14 @@ from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig from irm_kmi_api import IrmKmiApiClient from . import async_reload_entry -from .const import (OUT_OF_BENELUX, REPAIR_OPT_DELETE, REPAIR_OPT_MOVE, - REPAIR_OPTIONS, REPAIR_SOLUTION, USER_AGENT) +from .const import ( + OUT_OF_BENELUX, + REPAIR_OPT_DELETE, + REPAIR_OPT_MOVE, + REPAIR_OPTIONS, + REPAIR_SOLUTION, + USER_AGENT, +) from .utils import modify_from_config _LOGGER = logging.getLogger(__name__) diff --git a/custom_components/irm_kmi/sensor.py b/custom_components/irm_kmi/sensor.py index 2d6e9ac..05e9fbe 100644 --- a/custom_components/irm_kmi/sensor.py +++ b/custom_components/irm_kmi/sensor.py @@ -9,12 +9,17 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.util import dt -from irm_kmi_api import ExtendedForecast, PollenParser, PollenName, RadarForecast +from irm_kmi_api import ExtendedForecast, PollenName, PollenParser, RadarForecast +from .const import ( + CURRENT_WEATHER_SENSOR_CLASS, + CURRENT_WEATHER_SENSOR_ICON, + CURRENT_WEATHER_SENSOR_UNITS, + CURRENT_WEATHER_SENSORS, + DOMAIN, + POLLEN_TO_ICON_MAP, +) from .coordinator import IrmKmiCoordinator -from .const import (CURRENT_WEATHER_SENSOR_CLASS, CURRENT_WEATHER_SENSOR_ICON, - CURRENT_WEATHER_SENSOR_UNITS, CURRENT_WEATHER_SENSORS, - POLLEN_TO_ICON_MAP, DOMAIN) _LOGGER = logging.getLogger(__name__) diff --git a/custom_components/irm_kmi/weather.py b/custom_components/irm_kmi/weather.py index 11d1b8b..e4adaf8 100644 --- a/custom_components/irm_kmi/weather.py +++ b/custom_components/irm_kmi/weather.py @@ -1,14 +1,21 @@ """Support for IRM KMI weather.""" import logging from datetime import datetime -from typing import List, Dict +from typing import Dict, List import voluptuous as vol -from homeassistant.components.weather import (Forecast, WeatherEntity, - WeatherEntityFeature) +from homeassistant.components.weather import ( + Forecast, + WeatherEntity, + WeatherEntityFeature, +) from homeassistant.config_entries import ConfigEntry -from homeassistant.const import (UnitOfPrecipitationDepth, UnitOfPressure, - UnitOfSpeed, UnitOfTemperature) +from homeassistant.const import ( + UnitOfPrecipitationDepth, + UnitOfPressure, + UnitOfSpeed, + UnitOfTemperature, +) from homeassistant.core import HomeAssistant, SupportsResponse from homeassistant.helpers import config_validation as cv from homeassistant.helpers import entity_platform diff --git a/tests/conftest.py b/tests/conftest.py index ba3368f..44ddf81 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,14 +8,24 @@ from unittest.mock import MagicMock, patch import pytest from homeassistant.const import CONF_ZONE -from irm_kmi_api import IrmKmiApiClientHa, IrmKmiApiError, AnimationFrameData, RadarAnimationData, RadarStyle -from pytest_homeassistant_custom_component.common import (MockConfigEntry, - load_fixture) +from irm_kmi_api import ( + AnimationFrameData, + IrmKmiApiClientHa, + IrmKmiApiError, + RadarAnimationData, + RadarStyle, +) +from pytest_homeassistant_custom_component.common import MockConfigEntry, load_fixture from custom_components.irm_kmi.const import ( - CONF_DARK_MODE, CONF_LANGUAGE_OVERRIDE, CONF_STYLE, - CONF_USE_DEPRECATED_FORECAST, DOMAIN, IRM_KMI_TO_HA_CONDITION_MAP, - OPTION_DEPRECATED_FORECAST_NOT_USED) + CONF_DARK_MODE, + CONF_LANGUAGE_OVERRIDE, + CONF_STYLE, + CONF_USE_DEPRECATED_FORECAST, + DOMAIN, + IRM_KMI_TO_HA_CONDITION_MAP, + OPTION_DEPRECATED_FORECAST_NOT_USED, +) def get_api_data(fixture: str) -> dict: diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py index 7499ca6..5125b93 100644 --- a/tests/test_config_flow.py +++ b/tests/test_config_flow.py @@ -12,8 +12,12 @@ from pytest_homeassistant_custom_component.common import MockConfigEntry from custom_components.irm_kmi import async_migrate_entry from custom_components.irm_kmi.const import ( - CONF_DARK_MODE, CONF_LANGUAGE_OVERRIDE, CONF_STYLE, - CONFIG_FLOW_VERSION, DOMAIN) + CONF_DARK_MODE, + CONF_LANGUAGE_OVERRIDE, + CONF_STYLE, + CONFIG_FLOW_VERSION, + DOMAIN, +) async def test_full_user_flow( diff --git a/tests/test_current_weather_sensors.py b/tests/test_current_weather_sensors.py index 50dc0ca..9f9146f 100644 --- a/tests/test_current_weather_sensors.py +++ b/tests/test_current_weather_sensors.py @@ -7,9 +7,11 @@ from irm_kmi_api.data import CurrentWeatherData from pytest_homeassistant_custom_component.common import MockConfigEntry from custom_components.irm_kmi import IrmKmiCoordinator -from custom_components.irm_kmi.const import (CURRENT_WEATHER_SENSOR_CLASS, - CURRENT_WEATHER_SENSOR_UNITS, - CURRENT_WEATHER_SENSORS) +from custom_components.irm_kmi.const import ( + CURRENT_WEATHER_SENSOR_CLASS, + CURRENT_WEATHER_SENSOR_UNITS, + CURRENT_WEATHER_SENSORS, +) from custom_components.irm_kmi.data import ProcessedCoordinatorData from custom_components.irm_kmi.sensor import IrmKmiCurrentRainfall from tests.conftest import get_api_with_data diff --git a/tests/test_init.py b/tests/test_init.py index fad40ff..1b607e7 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -11,8 +11,12 @@ from pytest_homeassistant_custom_component.common import MockConfigEntry from custom_components.irm_kmi import async_migrate_entry from custom_components.irm_kmi.const import ( - CONF_DARK_MODE, CONF_LANGUAGE_OVERRIDE, CONF_STYLE, - CONFIG_FLOW_VERSION, DOMAIN) + CONF_DARK_MODE, + CONF_LANGUAGE_OVERRIDE, + CONF_STYLE, + CONFIG_FLOW_VERSION, + DOMAIN, +) async def test_load_unload_config_entry( diff --git a/tests/test_repairs.py b/tests/test_repairs.py index bc92fe0..5c15d1a 100644 --- a/tests/test_repairs.py +++ b/tests/test_repairs.py @@ -5,14 +5,18 @@ from unittest.mock import AsyncMock, MagicMock from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import FlowResultType from homeassistant.helpers import issue_registry -from pytest_homeassistant_custom_component.common import (MockConfigEntry, - load_fixture) +from pytest_homeassistant_custom_component.common import MockConfigEntry, load_fixture from custom_components.irm_kmi import DOMAIN, IrmKmiCoordinator -from custom_components.irm_kmi.const import (REPAIR_OPT_DELETE, - REPAIR_OPT_MOVE, REPAIR_SOLUTION) -from custom_components.irm_kmi.repairs import (OutOfBeneluxRepairFlow, - async_create_fix_flow) +from custom_components.irm_kmi.const import ( + REPAIR_OPT_DELETE, + REPAIR_OPT_MOVE, + REPAIR_SOLUTION, +) +from custom_components.irm_kmi.repairs import ( + OutOfBeneluxRepairFlow, + async_create_fix_flow, +) _LOGGER = logging.getLogger(__name__) diff --git a/tests/test_sensors.py b/tests/test_sensors.py index 25b6928..3e48fdd 100644 --- a/tests/test_sensors.py +++ b/tests/test_sensors.py @@ -8,8 +8,7 @@ from pytest_homeassistant_custom_component.common import MockConfigEntry from custom_components.irm_kmi import IrmKmiCoordinator from custom_components.irm_kmi.binary_sensor import IrmKmiWarning from custom_components.irm_kmi.const import CONF_LANGUAGE_OVERRIDE -from custom_components.irm_kmi.sensor import (IrmKmiNextSunMove, - IrmKmiNextWarning) +from custom_components.irm_kmi.sensor import IrmKmiNextSunMove, IrmKmiNextWarning from tests.conftest import get_api_with_data, get_radar_animation_data diff --git a/tests/test_weather.py b/tests/test_weather.py index 0f47996..5cec4fa 100644 --- a/tests/test_weather.py +++ b/tests/test_weather.py @@ -1,16 +1,15 @@ import json from datetime import datetime -from typing import List, Dict +from typing import Dict, List from freezegun import freeze_time from homeassistant.components.weather import Forecast from homeassistant.core import HomeAssistant from irm_kmi_api.data import RadarForecast -from pytest_homeassistant_custom_component.common import (MockConfigEntry, - load_fixture) +from pytest_homeassistant_custom_component.common import MockConfigEntry, load_fixture -from custom_components.irm_kmi.weather import IrmKmiCoordinator, IrmKmiWeather from custom_components.irm_kmi.data import ProcessedCoordinatorData +from custom_components.irm_kmi.weather import IrmKmiCoordinator, IrmKmiWeather from tests.conftest import get_api_with_data