Remove Jewish Calendar config flow upgrade (#129612)

homeassistant/components/jewish_calendar/__init__.py

@@ -14,10 +14,8 @@ from homeassistant.const import (
     CONF_TIME_ZONE,
     Platform,
 )
-from homeassistant.core import HomeAssistant, callback
-import homeassistant.helpers.entity_registry as er
+from homeassistant.core import HomeAssistant
 
-from .binary_sensor import BINARY_SENSORS
 from .const import (
     CONF_CANDLE_LIGHT_MINUTES,
     CONF_DIASPORA,
@@ -26,38 +24,12 @@ from .const import (
     DEFAULT_DIASPORA,
     DEFAULT_HAVDALAH_OFFSET_MINUTES,
     DEFAULT_LANGUAGE,
-    DOMAIN,
 )
 from .entity import JewishCalendarConfigEntry, JewishCalendarData
-from .sensor import INFO_SENSORS, TIME_SENSORS
 
 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
-def get_unique_prefix(
-    location: Location,
-    language: str,
-    candle_lighting_offset: int | None,
-    havdalah_offset: int | None,
-) -> str:
-    """Create a prefix for unique ids."""
-    # location.altitude was unset before 2024.6 when this method
-    # was used to create the unique id. As such it would always
-    # use the default altitude of 754.
-    config_properties = [
-        location.latitude,
-        location.longitude,
-        location.timezone,
-        754,
-        location.diaspora,
-        language,
-        candle_lighting_offset,
-        havdalah_offset,
-    ]
-    prefix = "_".join(map(str, config_properties))
-    return f"{prefix}"
-
-
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
 ) -> bool:
@@ -91,16 +63,6 @@ async def async_setup_entry(
         havdalah_offset,
     )
 
-    # Update unique ID to be unrelated to user defined options
-    old_prefix = get_unique_prefix(
-        location, language, candle_lighting_offset, havdalah_offset
-    )
-
-    ent_reg = er.async_get(hass)
-    entries = er.async_entries_for_config_entry(ent_reg, config_entry.entry_id)
-    if not entries or any(entry.unique_id.startswith(old_prefix) for entry in entries):
-        async_update_unique_ids(ent_reg, config_entry.entry_id, old_prefix)
-
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     async def update_listener(
@@ -118,25 +80,3 @@ async def async_unload_entry(
 ) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
-
-
-@callback
-def async_update_unique_ids(
-    ent_reg: er.EntityRegistry, new_prefix: str, old_prefix: str
-) -> None:
-    """Update unique ID to be unrelated to user defined options.
-
-    Introduced with release 2024.6
-    """
-    platform_descriptions = {
-        Platform.BINARY_SENSOR: BINARY_SENSORS,
-        Platform.SENSOR: (*INFO_SENSORS, *TIME_SENSORS),
-    }
-    for platform, descriptions in platform_descriptions.items():
-        for description in descriptions:
-            new_unique_id = f"{new_prefix}-{description.key}"
-            old_unique_id = f"{old_prefix}_{description.key}"
-            if entity_id := ent_reg.async_get_entity_id(
-                platform, DOMAIN, old_unique_id
-            ):
-                ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)