diff --git a/custom_components/xplora_watch/__init__.py b/custom_components/xplora_watch/__init__.py index a201ed19..7ba83f98 100644 --- a/custom_components/xplora_watch/__init__.py +++ b/custom_components/xplora_watch/__init__.py @@ -7,9 +7,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, Platform from homeassistant.core import HomeAssistant, callback -from homeassistant.helpers import aiohttp_client, discovery -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers import entity_registry as er +from homeassistant.helpers import aiohttp_client, config_validation as cv, discovery, entity_registry as er from homeassistant.helpers.typing import ConfigType from .const import DATA_HASS_CONFIG, DOMAIN diff --git a/custom_components/xplora_watch/binary_sensor.py b/custom_components/xplora_watch/binary_sensor.py index 3d1647dc..c057276a 100644 --- a/custom_components/xplora_watch/binary_sensor.py +++ b/custom_components/xplora_watch/binary_sensor.py @@ -5,11 +5,7 @@ import logging from typing import Any -from homeassistant.components.binary_sensor import ( - BinarySensorDeviceClass, - BinarySensorEntity, - BinarySensorEntityDescription, -) +from homeassistant.components.binary_sensor import BinarySensorDeviceClass, BinarySensorEntity, BinarySensorEntityDescription from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_ID, diff --git a/custom_components/xplora_watch/config_flow.py b/custom_components/xplora_watch/config_flow.py index 414a2ac5..b38a3808 100644 --- a/custom_components/xplora_watch/config_flow.py +++ b/custom_components/xplora_watch/config_flow.py @@ -2,23 +2,18 @@ from __future__ import annotations -import logging from collections import OrderedDict +import logging from types import MappingProxyType from typing import Any -import voluptuous as vol from pyxplora_api.exception_classes import Error, LoginError, PhoneOrEmailFail from pyxplora_api.pyxplora_api_async import PyXploraApi from pyxplora_api.status import UserContactType +import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant import config_entries, core -from homeassistant.config_entries import ( - ConfigEntry, - OptionsFlow, - OptionsFlowWithConfigEntry, -) +from homeassistant.config_entries import ConfigEntry, OptionsFlow, OptionsFlowWithConfigEntry from homeassistant.const import ( ATTR_LATITUDE, ATTR_LONGITUDE, @@ -33,6 +28,7 @@ from homeassistant.core import callback from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers import aiohttp_client +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.selector import ( BooleanSelector, NumberSelector, diff --git a/custom_components/xplora_watch/const_schema.py b/custom_components/xplora_watch/const_schema.py index dffeea8b..c93fd563 100644 --- a/custom_components/xplora_watch/const_schema.py +++ b/custom_components/xplora_watch/const_schema.py @@ -15,14 +15,7 @@ TextSelectorType, ) -from .const import ( - CONF_PHONENUMBER, - CONF_TIMEZONE, - CONF_USERLANG, - DEFAULT_LANGUAGE, - SUPPORTED_LANGUAGES, - XPLORA_USER_LANGS, -) +from .const import CONF_PHONENUMBER, CONF_TIMEZONE, CONF_USERLANG, DEFAULT_LANGUAGE, SUPPORTED_LANGUAGES, XPLORA_USER_LANGS DEFAULT_DATA_SCHEMA = { vol.Required(CONF_PASSWORD): TextSelector(TextSelectorConfig(type=TextSelectorType.PASSWORD)), diff --git a/custom_components/xplora_watch/coordinator.py b/custom_components/xplora_watch/coordinator.py index b53f7c65..64d8ee5a 100644 --- a/custom_components/xplora_watch/coordinator.py +++ b/custom_components/xplora_watch/coordinator.py @@ -2,8 +2,8 @@ from __future__ import annotations -import logging from datetime import datetime, timedelta +import logging from typing import Any import aiohttp @@ -12,18 +12,9 @@ from pyxplora_api.pyxplora_api_async import PyXploraApi from pyxplora_api.status import LocationType, WatchOnlineStatus -from homeassistant.components.device_tracker.const import ( - ATTR_BATTERY, - ATTR_LOCATION_NAME, -) +from homeassistant.components.device_tracker.const import ATTR_BATTERY, ATTR_LOCATION_NAME from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ( - CONF_COUNTRY_CODE, - CONF_EMAIL, - CONF_LANGUAGE, - CONF_PASSWORD, - CONF_SCAN_INTERVAL, -) +from homeassistant.const import CONF_COUNTRY_CODE, CONF_EMAIL, CONF_LANGUAGE, CONF_PASSWORD, CONF_SCAN_INTERVAL from homeassistant.core import HomeAssistant from homeassistant.helpers import aiohttp_client from homeassistant.helpers.update_coordinator import DataUpdateCoordinator diff --git a/custom_components/xplora_watch/device_tracker.py b/custom_components/xplora_watch/device_tracker.py index a7648f2a..9140d5ae 100644 --- a/custom_components/xplora_watch/device_tracker.py +++ b/custom_components/xplora_watch/device_tracker.py @@ -7,10 +7,7 @@ from homeassistant.components.device_tracker import SourceType from homeassistant.components.device_tracker.config_entry import TrackerEntity -from homeassistant.components.device_tracker.const import ( - ATTR_BATTERY, - ATTR_LOCATION_NAME, -) +from homeassistant.components.device_tracker.const import ATTR_BATTERY, ATTR_LOCATION_NAME from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_ID, CONF_NAME from homeassistant.core import HomeAssistant diff --git a/custom_components/xplora_watch/entity.py b/custom_components/xplora_watch/entity.py index 65558f0f..28ef2aee 100644 --- a/custom_components/xplora_watch/entity.py +++ b/custom_components/xplora_watch/entity.py @@ -2,8 +2,8 @@ from __future__ import annotations -import logging from collections.abc import Callable +import logging from homeassistant.config_entries import ConfigEntry from homeassistant.core import callback diff --git a/custom_components/xplora_watch/geocoder.py b/custom_components/xplora_watch/geocoder.py index 3cffc02b..84f5514d 100644 --- a/custom_components/xplora_watch/geocoder.py +++ b/custom_components/xplora_watch/geocoder.py @@ -9,7 +9,7 @@ https://raw.githubusercontent.com/OpenCageData/python-opencage-geocoder/master/LICENSE.txt """ -from __future__ import annotations +from __future__ import annotations # noqa: I001 import collections import os diff --git a/custom_components/xplora_watch/manifest.json b/custom_components/xplora_watch/manifest.json index 18fc6166..57ee7f58 100644 --- a/custom_components/xplora_watch/manifest.json +++ b/custom_components/xplora_watch/manifest.json @@ -18,5 +18,5 @@ "pydub", "marshmallow-enum" ], - "version": "v2.13.6" + "version": "v2.13.7" } diff --git a/custom_components/xplora_watch/sensor.py b/custom_components/xplora_watch/sensor.py index 655b7ae0..3eea517d 100644 --- a/custom_components/xplora_watch/sensor.py +++ b/custom_components/xplora_watch/sensor.py @@ -5,19 +5,9 @@ import logging from typing import Any -from homeassistant.components.sensor import ( - SensorDeviceClass, - SensorEntity, - SensorEntityDescription, -) +from homeassistant.components.sensor import SensorDeviceClass, SensorEntity, SensorEntityDescription from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ( - ATTR_ID, - CONF_NAME, - PERCENTAGE, - EntityCategory, - UnitOfLength, -) +from homeassistant.const import ATTR_ID, CONF_NAME, PERCENTAGE, EntityCategory, UnitOfLength from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import StateType diff --git a/custom_components/xplora_watch/services.py b/custom_components/xplora_watch/services.py index dfb3835e..0421506a 100644 --- a/custom_components/xplora_watch/services.py +++ b/custom_components/xplora_watch/services.py @@ -5,11 +5,11 @@ import logging from typing import Any -import voluptuous as vol from pyxplora_api.exception_classes import NoAdminError +import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.core import HomeAssistant, ServiceCall, callback +import homeassistant.helpers.config_validation as cv from .const import ( ATTR_SERVICE_DELETE_MSG, diff --git a/custom_components/xplora_watch/switch.py b/custom_components/xplora_watch/switch.py index 63f7e2c4..13711cd4 100644 --- a/custom_components/xplora_watch/switch.py +++ b/custom_components/xplora_watch/switch.py @@ -7,11 +7,7 @@ from pyxplora_api.pyxplora_api_async import PyXploraApi -from homeassistant.components.switch import ( - SwitchDeviceClass, - SwitchEntity, - SwitchEntityDescription, -) +from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity, SwitchEntityDescription from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_ID, CONF_LANGUAGE, CONF_NAME from homeassistant.core import HomeAssistant, callback @@ -205,11 +201,9 @@ def __init__( self._silent = silent - self._attr_name: str = ( - f'{ward.get(CONF_NAME)} {ATTR_WATCH} {description.key} {silent["start"]}-{silent["end"]} ({coordinator.username})'.replace( # noqa: E501 - "_", " " - ).title() - ) + self._attr_name: str = f'{ward.get(CONF_NAME)} {ATTR_WATCH} {description.key} {silent["start"]}-{silent["end"]} ({coordinator.username})'.replace( # noqa: E501 + "_", " " + ).title() self._attr_unique_id = ( f'{ward.get(CONF_NAME)}_{ATTR_WATCH}_{description.key}_{silent["vendorId"]}_{wuid}_{coordinator.user_id}'.replace( diff --git a/scripts/update/hacs.py b/scripts/update/hacs.py index 6deff421..3b21123c 100644 --- a/scripts/update/hacs.py +++ b/scripts/update/hacs.py @@ -3,8 +3,8 @@ import json import os -import sys from pathlib import Path +import sys HACS_FILE = Path(f"{os.getcwd()}/hacs.json")