Drop support for HA versions before 2024.12.0

Author: pnbruckner

README.md

@@ -44,7 +44,7 @@ After it has been downloaded you will need to restart Home Assistant.
 
 ### Versions
 
-This custom integration supports HomeAssistant versions 2024.8.3 or newer.
+This custom integration supports HomeAssistant versions 2024.12.0 or newer.
 
 ## Services
 

custom_components/sun2/config_flow.py

@@ -4,9 +4,11 @@
 from abc import abstractmethod
 from collections.abc import Mapping
 from contextlib import suppress
+from copy import deepcopy
 from typing import Any, cast
 import zoneinfo
 
+from propcache.api import cached_property
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import DOMAIN as BS_DOMAIN
@@ -17,7 +19,7 @@
     ConfigEntryBaseFlow,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlowWithConfigEntry,
+    OptionsFlow,
 )
 from homeassistant.const import (
     CONF_BINARY_SENSORS,
@@ -109,27 +111,21 @@ def loc_from_options(
 class Sun2Flow(ConfigEntryBaseFlow):
     """Sun2 flow mixin."""
 
-    _existing_entries: list[ConfigEntry] | None = None
-    _existing_entities: dict[str, str] | None = None
+    options: dict[str, Any]
 
     # Temporary variables between steps.
     _use_map: bool
     _sunrise_obstruction: bool
     _sunset_obstruction: bool
 
-    @property
+    @cached_property
     def _entries(self) -> list[ConfigEntry]:
         """Get existing config entries."""
-        if self._existing_entries is None:
-            self._existing_entries = self.hass.config_entries.async_entries(DOMAIN)
-        return self._existing_entries
+        return self.hass.config_entries.async_entries(DOMAIN)
 
-    @property
+    @cached_property
     def _entities(self) -> dict[str, str]:
         """Get existing configured entities."""
-        if self._existing_entities is not None:
-            return self._existing_entities
-
         ent_reg = er.async_get(self.hass)
         existing_entities: dict[str, str] = {}
         for key, domain in {
@@ -142,14 +138,8 @@ def _entities(self) -> dict[str, str]:
                     str, ent_reg.async_get_entity_id(domain, DOMAIN, unique_id)
                 )
                 existing_entities[entity_id] = unique_id
-        self._existing_entities = existing_entities
         return existing_entities
 
-    @property
-    @abstractmethod
-    def options(self) -> dict[str, Any]:
-        """Return mutable copy of options."""
-
     def _any_using_ha_loc(self) -> bool:
         """Determine if a config is using Home Assistant location."""
         return any(CONF_LATITUDE not in entry.options for entry in self._entries)
@@ -550,7 +540,7 @@ class Sun2ConfigFlow(ConfigFlow, Sun2Flow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize config flow."""
-        self._options: dict[str, Any] = {}
+        self.options = {}
 
     @staticmethod
     @callback
@@ -568,14 +558,7 @@ def async_get_options_flow(config_entry: ConfigEntry) -> Sun2OptionsFlow:
     @callback
     def async_supports_options_flow(cls, config_entry: ConfigEntry) -> bool:
         """Return options flow support for this handler."""
-        if config_entry.source == SOURCE_IMPORT:
-            return False
-        return True
-
-    @property
-    def options(self) -> dict[str, Any]:
-        """Return mutable copy of options."""
-        return self._options
+        return config_entry.source != SOURCE_IMPORT
 
     async def async_step_import(self, data: dict[str, Any]) -> ConfigFlowResult:
         """Import config entry from configuration."""
@@ -658,9 +641,13 @@ async def async_step_done(
         )
 
 
-class Sun2OptionsFlow(OptionsFlowWithConfigEntry, Sun2Flow):
+class Sun2OptionsFlow(OptionsFlow, Sun2Flow):
     """Sun2 integration options flow."""
 
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize flow."""
+        self.options = deepcopy(dict(config_entry.options))
+
     async def async_step_done(
         self, _: dict[str, Any] | None = None
     ) -> ConfigFlowResult:

custom_components/sun2/helpers.py

@@ -6,17 +6,14 @@
 from contextlib import suppress
 from dataclasses import dataclass, field
 from datetime import date, datetime, time, timedelta, tzinfo
-from functools import (  # pylint: disable=hass-deprecated-import
-    cached_property,
-    lru_cache,
-    partial,
-)
+from functools import lru_cache, partial
 from math import copysign, fabs
 from typing import Any, Self, cast
 
 from astral import LocationInfo, SunDirection
 from astral.location import Location
 from astral.sun import adjust_to_horizon, adjust_to_obscuring_feature
+from propcache.api import cached_property
 
 from homeassistant.components.binary_sensor import (
     DOMAIN as BS_DOMAIN,
@@ -31,14 +28,7 @@
     CONF_TIME_ZONE,
 )
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
-
-# Config moved from core to core_config in 2024.11
-
-try:
-    from homeassistant.core_config import Config
-except ImportError:
-    from homeassistant.core import Config  # type: ignore[no-redef]
-
+from homeassistant.core_config import Config
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity

custom_components/sun2/sensor.py

@@ -7,13 +7,13 @@
 from contextlib import suppress
 from dataclasses import asdict, dataclass, make_dataclass
 from datetime import date, datetime, time, timedelta
-from functools import cached_property  # pylint: disable=hass-deprecated-import
 from itertools import chain
 from math import fabs
 from typing import Any, Generic, TypeVar, cast
 
 from astral import SunDirection
 from astral.sun import SUN_APPARENT_RADIUS
+from propcache.api import cached_property
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,

hacs.json

@@ -1,4 +1,4 @@
 {
   "name": "Sun2",
-  "homeassistant": "2024.8.3"
+  "homeassistant": "2024.12.0"
 }