Move AdvertisementDataCallback import to TYPE_CHECKING

bleak removed register_detection_callback, so the detection callback
must now be passed via the BleakScanner constructor. Pass an optional
detection_callback through to HaBleakScannerWrapper so callers can wire
it up at construction time.

.claude/skills/integrations/SKILL.md

@@ -12,8 +12,6 @@ description: Everything you need to know to build, test and review Home Assistan
 - When looking for examples, prefer integrations with the platinum or gold quality scale level first.
 - Polling intervals are NOT user-configurable. Never add scan_interval, update_interval, or polling frequency options to config flows or config entries.
 - Do NOT allow users to set config entry names in config flows. Names are automatically generated or can be customized later in UI. Exception: helper integrations may allow custom names.
-- For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
-- When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
 
 The following platforms have extra guidelines:
 - **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection

.github/copilot-instructions.md

@@ -32,9 +32,6 @@ Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) ov
 
 Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
 
-When reviewing entity actions, do not suggest extra defensive checks for input fields that are already validated by Home Assistant's service/action schemas and entity selection filters. Suggest additional guards only when data bypasses those validators or is transformed into a less-safe form.
-When validation guarantees a dict key exists, prefer direct key access (`data["key"]`) instead of `.get("key")` so contract violations are surfaced instead of silently masked.
-
 
 # Skills
 

.github/workflows/ci.yaml

@@ -282,7 +282,7 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
           echo "::add-matcher::.github/workflows/matchers/codespell.json"
       - name: Run prek
-        uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2
+        uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
         env:
           PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config,zizmor
           RUFF_OUTPUT_FORMAT: github
@@ -303,7 +303,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Run zizmor
-        uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2
+        uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
         with:
           extra-args: --all-files zizmor
 
@@ -366,7 +366,7 @@ jobs:
           echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           key: >-
@@ -374,7 +374,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -386,7 +386,7 @@ jobs:
             env.HA_SHORT_VERSION }}-
       - name: Check if apt cache exists
         id: cache-apt-check
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
           path: |
@@ -432,7 +432,7 @@ jobs:
           fi
       - name: Save apt cache
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -486,7 +486,7 @@ jobs:
       && github.event.inputs.audit-licenses-only != 'true'
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -517,7 +517,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -554,7 +554,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -645,7 +645,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -696,7 +696,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -749,7 +749,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -806,7 +806,7 @@ jobs:
           echo "key=mypy-${MYPY_CACHE_VERSION}-${mypy_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -814,7 +814,7 @@ jobs:
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: .mypy_cache
           key: >-
@@ -856,7 +856,7 @@ jobs:
       - base
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -889,7 +889,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -932,7 +932,7 @@ jobs:
         group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -966,7 +966,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1084,7 +1084,7 @@ jobs:
         mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1119,7 +1119,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1242,7 +1242,7 @@ jobs:
         postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1279,7 +1279,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1425,7 +1425,7 @@ jobs:
         group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1459,7 +1459,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: venv
           fail-on-cache-miss: true

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
         exclude_types: [csv, json, html]
         exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.24.0
+    rev: v1.23.1
     hooks:
       - id: zizmor
         args:

.strict-typing

@@ -178,7 +178,6 @@ homeassistant.components.dropbox.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*
-homeassistant.components.duco.*
 homeassistant.components.dunehd.*
 homeassistant.components.duotecno.*
 homeassistant.components.easyenergy.*

AGENTS.md

@@ -22,6 +22,3 @@ Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) ov
 ## Good practices
 
 Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
-
-When reviewing entity actions, do not suggest extra defensive checks for input fields that are already validated by Home Assistant's service/action schemas and entity selection filters. Suggest additional guards only when data bypasses those validators or is transformed into a less-safe form.
-When validation guarantees a dict key exists, prefer direct key access (`data["key"]`) instead of `.get("key")` so contract violations are surfaced instead of silently masked.

homeassistant/bootstrap.py

@@ -238,12 +238,9 @@ DEFAULT_INTEGRATIONS = {
     "timer",
     #
     # Base platforms:
-    # Note:
-    # - AI task is not included to not give the perception that AI functionality
-    # is mandatory with Home Assistant.
-    # - Calendar and todo are not included to prevent them from registering
+    # Note: Calendar and todo are not included to prevent them from registering
     # their frontend panels when there are no calendar or todo integrations.
-    *(BASE_PLATFORMS - {"ai_task", "calendar", "todo"}),
+    *(BASE_PLATFORMS - {"calendar", "todo"}),
     #
     # Integrations providing triggers and conditions for base platforms:
     "air_quality",

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==13.4.3"]
+  "requirements": ["aioamazondevices==13.4.1"]
 }

homeassistant/components/anthropic/__init__.py

@@ -230,19 +230,6 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AnthropicConfigEntry)
                 )
         hass.config_entries.async_update_entry(entry, minor_version=3)
 
-    if entry.version == 2 and entry.minor_version == 3:
-        # Remove Temperature parameter
-        CONF_TEMPERATURE = "temperature"
-
-        for subentry in entry.subentries.values():
-            data = subentry.data.copy()
-            if CONF_TEMPERATURE not in data:
-                continue
-            data.pop(CONF_TEMPERATURE, None)
-            hass.config_entries.async_update_subentry(entry, subentry, data=data)
-
-        hass.config_entries.async_update_entry(entry, minor_version=4)
-
     LOGGER.debug(
         "Migration to version %s:%s successful", entry.version, entry.minor_version
     )

homeassistant/components/anthropic/config_flow.py

@@ -50,6 +50,7 @@ from .const import (
     CONF_PROMPT,
     CONF_PROMPT_CACHING,
     CONF_RECOMMENDED,
+    CONF_TEMPERATURE,
     CONF_THINKING_BUDGET,
     CONF_THINKING_EFFORT,
     CONF_TOOL_SEARCH,
@@ -108,7 +109,7 @@ class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Anthropic."""
 
     VERSION = 2
-    MINOR_VERSION = 4
+    MINOR_VERSION = 3
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -323,6 +324,10 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             ): SelectSelector(
                 SelectSelectorConfig(options=self._get_model_list(), custom_value=True)
             ),
+            vol.Optional(
+                CONF_TEMPERATURE,
+                default=DEFAULT[CONF_TEMPERATURE],
+            ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
             vol.Optional(
                 CONF_PROMPT_CACHING,
                 default=DEFAULT[CONF_PROMPT_CACHING],

homeassistant/components/anthropic/const.py

@@ -15,6 +15,7 @@ CONF_CHAT_MODEL = "chat_model"
 CONF_CODE_EXECUTION = "code_execution"
 CONF_MAX_TOKENS = "max_tokens"
 CONF_PROMPT_CACHING = "prompt_caching"
+CONF_TEMPERATURE = "temperature"
 CONF_THINKING_BUDGET = "thinking_budget"
 CONF_THINKING_EFFORT = "thinking_effort"
 CONF_TOOL_SEARCH = "tool_search"
@@ -42,6 +43,7 @@ DEFAULT = {
     CONF_CODE_EXECUTION: False,
     CONF_MAX_TOKENS: 3000,
     CONF_PROMPT_CACHING: PromptCaching.PROMPT.value,
+    CONF_TEMPERATURE: 1.0,
     CONF_THINKING_BUDGET: MIN_THINKING_BUDGET,
     CONF_THINKING_EFFORT: "low",
     CONF_TOOL_SEARCH: False,

homeassistant/components/anthropic/entity.py

@@ -98,6 +98,7 @@ from .const import (
     CONF_CODE_EXECUTION,
     CONF_MAX_TOKENS,
     CONF_PROMPT_CACHING,
+    CONF_TEMPERATURE,
     CONF_THINKING_BUDGET,
     CONF_THINKING_EFFORT,
     CONF_TOOL_SEARCH,
@@ -767,6 +768,9 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 model_args["output_config"] = OutputConfigParam(effort=thinking_effort)
             else:
                 model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
+                model_args["temperature"] = options.get(
+                    CONF_TEMPERATURE, DEFAULT[CONF_TEMPERATURE]
+                )
         else:
             thinking_budget = options.get(
                 CONF_THINKING_BUDGET, DEFAULT[CONF_THINKING_BUDGET]
@@ -781,6 +785,9 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 )
             else:
                 model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
+                model_args["temperature"] = options.get(
+                    CONF_TEMPERATURE, DEFAULT[CONF_TEMPERATURE]
+                )
 
             if (
                 self.model_info.capabilities

homeassistant/components/bluetooth/api.py

@@ -30,6 +30,7 @@ from .models import BluetoothCallback, BluetoothChange, ProcessAdvertisementCall
 
 if TYPE_CHECKING:
     from bleak.backends.device import BLEDevice
+    from bleak.backends.scanner import AdvertisementDataCallback
 
 
 @singleton(DATA_MANAGER)
@@ -39,7 +40,10 @@ def _get_manager(hass: HomeAssistant) -> HomeAssistantBluetoothManager:
 
 
 @hass_callback
-def async_get_scanner(hass: HomeAssistant) -> BleakScanner:
+def async_get_scanner(
+    hass: HomeAssistant,
+    detection_callback: AdvertisementDataCallback | None = None,
+) -> BleakScanner:
     """Return a HaBleakScannerWrapper cast to BleakScanner.
 
     This is a wrapper around our BleakScanner singleton that allows
@@ -48,7 +52,9 @@ def async_get_scanner(hass: HomeAssistant) -> BleakScanner:
     The wrapper is cast to BleakScanner for type compatibility with
     libraries expecting a BleakScanner instance.
     """
-    return cast(BleakScanner, HaBleakScannerWrapper())
+    return cast(
+        BleakScanner, HaBleakScannerWrapper(detection_callback=detection_callback)
+    )
 
 
 @hass_callback

homeassistant/components/bluetooth/manifest.json

@@ -21,6 +21,6 @@
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
     "dbus-fast==4.0.4",
-    "habluetooth==6.1.0"
+    "habluetooth==6.0.0"
   ]
 }

homeassistant/components/braviatv/__init__.py

@@ -7,11 +7,9 @@ from typing import Final
 from aiohttp import CookieJar
 from pybravia import BraviaClient
 
-from homeassistant.components import ssdp
 from homeassistant.const import CONF_HOST, CONF_MAC, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
-from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 
 from .const import CONF_USE_SSL
 from .coordinator import BraviaTVConfigEntry, BraviaTVCoordinator
@@ -48,19 +46,6 @@ async def async_setup_entry(
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
-    async def async_ssdp_callback(
-        discovery_info: SsdpServiceInfo, change: ssdp.SsdpChange
-    ) -> None:
-        await coordinator.async_request_refresh()
-
-    config_entry.async_on_unload(
-        await ssdp.async_register_callback(
-            hass,
-            async_ssdp_callback,
-            {"nt": "urn:schemas-upnp-org:device:MediaRenderer:1", "_host": host},
-        )
-    )
-
     return True
 
 

homeassistant/components/braviatv/coordinator.py

@@ -173,9 +173,6 @@ class BraviaTVCoordinator(DataUpdateCoordinator[None]):
             power_status = await self.client.get_power_status()
             self.is_on = power_status == "active"
             self.skipped_updates = 0
-            self.update_interval = (
-                timedelta(seconds=120) if power_status == "standby" else SCAN_INTERVAL
-            )
 
             if not self.system_info:
                 self.system_info = await self.client.get_system_info()

homeassistant/components/broadlink/const.py

@@ -6,7 +6,6 @@ DOMAIN = "broadlink"
 
 DOMAINS_AND_TYPES = {
     Platform.CLIMATE: {"HYS"},
-    Platform.INFRARED: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},
     Platform.LIGHT: {"LB1", "LB2"},
     Platform.REMOTE: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},
     Platform.SELECT: {"HYS"},
@@ -45,6 +44,3 @@ DEVICE_TYPES = set.union(*DOMAINS_AND_TYPES.values())
 
 DEFAULT_PORT = 80
 DEFAULT_TIMEOUT = 5
-
-# Broadlink IR packet format - repeat count byte offset
-IR_PACKET_REPEAT_INDEX = 1

homeassistant/components/broadlink/infrared.py

@@ -1,184 +0,0 @@
-"""Infrared platform for Broadlink remotes."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from broadlink.exceptions import BroadlinkException
-from broadlink.remote import pulses_to_data as _bl_pulses_to_data
-import infrared_protocols
-
-from homeassistant.components.infrared import InfraredCommand, InfraredEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import DOMAIN, IR_PACKET_REPEAT_INDEX
-from .entity import BroadlinkEntity
-
-if TYPE_CHECKING:
-    from .device import BroadlinkDevice
-
-PARALLEL_UPDATES = 1
-
-
-class BroadlinkIRCommand(InfraredCommand):
-    """Raw IR command with optional Broadlink hardware repeat count.
-
-    This class lets you send raw timing data through a Broadlink infrared
-    entity. The repeat_count maps directly to the Broadlink packet repeat
-    byte: the device will re-transmit the entire IR burst that many
-    additional times after the first transmission.
-
-    Use this when you have existing Broadlink-encoded IR data (e.g. from
-    IR code databases like SmartIR) and want to use it with the new
-    infrared platform.
-
-    Protocol-aware commands (infrared_protocols.NECCommand, LgTVCommand,
-    etc.) manage repeats *inside* get_raw_timings() and should use the
-    default repeat=0. Only BroadlinkIRCommand should set hardware repeat.
-
-    Example: Migrating IR code database base64 codes to the infrared platform:
-
-        import base64
-        from broadlink.remote import data_to_pulses
-        from homeassistant.components.broadlink.infrared import BroadlinkIRCommand
-        from homeassistant.components.broadlink.const import IR_PACKET_REPEAT_INDEX
-
-        # Decode base64 IR code (e.g. from IR code database)
-        packet_data = base64.b64decode(b64_code)
-        repeat_count = packet_data[IR_PACKET_REPEAT_INDEX]
-
-        # Parse Broadlink packet to microsecond timings
-        pulses = data_to_pulses(packet_data)
-        timings = list(zip(pulses[::2], pulses[1::2]))
-        if len(pulses) % 2:
-            timings.append((pulses[-1], 0))
-
-        # Create command
-        cmd = BroadlinkIRCommand(timings, repeat_count=repeat_count)
-        await infrared.async_send_command(hass, entity_id, cmd)
-    """
-
-    # Standard IR carrier frequency. Broadlink hardware handles the carrier
-    # internally, so this value is informational only.
-    MODULATION = 38000
-
-    def __init__(
-        self,
-        timings: list[tuple[int, int]],
-        repeat_count: int = 0,
-    ) -> None:
-        """Initialize with timing pairs and optional repeat count.
-
-        Args:
-            timings: List of (mark_us, space_us) pairs in microseconds.
-            repeat_count: Broadlink hardware repeat count (0 = send once).
-                Must be 0–255 (the hardware repeat byte is a single unsigned byte).
-
-        Raises:
-            ValueError: If repeat_count is outside 0–255 range.
-        """
-        if not 0 <= repeat_count <= 255:
-            raise ValueError(f"repeat_count must be 0–255, got {repeat_count}")
-        super().__init__(modulation=self.MODULATION, repeat_count=repeat_count)
-        self._timings = [
-            infrared_protocols.Timing(high_us=high, low_us=low) for high, low in timings
-        ]
-
-    def get_raw_timings(self) -> list[infrared_protocols.Timing]:
-        """Return timing pairs for transmission."""
-        return self._timings
-
-
-def timings_to_broadlink_packet(
-    timings: list[tuple[int, int]],
-    repeat: int = 0,
-) -> bytes:
-    """Convert raw timing pairs (high_us, low_us) to a Broadlink IR packet.
-
-    Args:
-        timings: List of (mark_us, space_us) pairs in microseconds.
-        repeat: Number of extra repeats (0 = send once).
-
-    Returns:
-        Binary packet ready for Broadlink send_data().
-
-    """
-    if not 0 <= repeat <= 255:
-        raise ValueError(f"repeat must be 0–255, got {repeat}")
-
-    # Flatten (mark, space) pairs into a pulse list, omitting any zero-length spaces
-    pulses: list[int] = []
-    for high_us, low_us in timings:
-        pulses.append(high_us)
-        if low_us:
-            pulses.append(low_us)
-
-    # Use broadlink library's encoder (tick=32.84 µs)
-    packet = bytearray(_bl_pulses_to_data(pulses))
-    packet[IR_PACKET_REPEAT_INDEX] = repeat
-    return bytes(packet)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Broadlink infrared entity."""
-    device = hass.data[DOMAIN].devices[config_entry.entry_id]
-    async_add_entities([BroadlinkInfraredEntity(device)])
-
-
-class BroadlinkInfraredEntity(BroadlinkEntity, InfraredEntity):
-    """Broadlink infrared transmitter entity."""
-
-    _attr_has_entity_name = True
-    _attr_translation_key = "infrared"
-
-    def __init__(self, device: BroadlinkDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(device)
-        self._attr_unique_id = f"{device.unique_id}-infrared"
-
-    async def async_send_command(self, command: InfraredCommand) -> None:
-        """Send an IR command via the Broadlink device.
-
-        Handles two types of repeat behavior:
-
-        1. Protocol-aware commands (NECCommand, etc.): These encode repeats
-           (like NEC repeat codes) inside their get_raw_timings() data. The
-           Broadlink packet is sent with repeat=0.
-
-        2. BroadlinkIRCommand: Carries Broadlink hardware repeat count,
-           which tells the device to re-transmit the entire burst N times.
-           This is used for protocols/commands that need multiple full frame
-           transmissions (e.g. legacy SmartIR data).
-
-        Using isinstance check ensures protocol-level repeats (already in
-        timing data) don't get conflated with hardware repeats.
-        """
-        timings = [
-            (timing.high_us, timing.low_us) for timing in command.get_raw_timings()
-        ]
-
-        # Only BroadlinkIRCommand uses Broadlink hardware repeat. Protocol-aware
-        # commands (NECCommand, etc.) encode repeats inside get_raw_timings()
-        # and must use hardware repeat=0 to avoid double-repeating.
-        if isinstance(command, BroadlinkIRCommand):
-            repeat = command.repeat_count
-        else:
-            repeat = 0
-
-        packet = timings_to_broadlink_packet(timings, repeat=repeat)
-
-        try:
-            await self._device.async_request(self._device.api.send_data, packet)
-        except (BroadlinkException, OSError) as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="send_command_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err

homeassistant/components/broadlink/manifest.json

@@ -3,7 +3,6 @@
   "name": "Broadlink",
   "codeowners": ["@danielhiversen", "@felipediel", "@L-I-Am", "@eifinger"],
   "config_flow": true,
-  "dependencies": ["infrared"],
   "dhcp": [
     {
       "registered_devices": true

homeassistant/components/broadlink/strings.json

@@ -49,11 +49,6 @@
     }
   },
   "entity": {
-    "infrared": {
-      "infrared": {
-        "name": "IR transmitter"
-      }
-    },
     "select": {
       "day_of_week": {
         "name": "Day of week",
@@ -82,10 +77,5 @@
         "name": "Total consumption"
       }
     }
-  },
-  "exceptions": {
-    "send_command_failed": {
-      "message": "Failed to send IR command: {error}"
-    }
   }
 }

homeassistant/components/device_tracker/legacy.py

@@ -6,7 +6,6 @@ import asyncio
 from collections.abc import Callable, Coroutine, Sequence
 from datetime import datetime, timedelta
 import hashlib
-import logging
 from types import ModuleType
 from typing import Any, Final, Protocol, final
 
@@ -83,8 +82,6 @@ from .const import (
     SourceType,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_SEE: Final = "see"
 
 SOURCE_TYPES = [cls.value for cls in SourceType]
@@ -131,8 +128,6 @@ SERVICE_SEE_PAYLOAD_SCHEMA: Final[vol.Schema] = vol.Schema(
 YAML_DEVICES: Final = "known_devices.yaml"
 EVENT_NEW_DEVICE: Final = "device_tracker_new_device"
 
-DATA_LEGACY_TRACKERS: Final = "device_tracker.legacy_trackers"
-
 
 class SeeCallback(Protocol):
     """Protocol type for DeviceTracker.see callback."""
@@ -248,19 +243,8 @@ async def _async_setup_integration(
     tracker = await get_tracker(hass, config)
     tracker_future.set_result(tracker)
 
-    warned_called_see = False
-
     async def async_see_service(call: ServiceCall) -> None:
         """Service to see a device."""
-        nonlocal warned_called_see
-        if not warned_called_see:
-            _LOGGER.warning(
-                "The %s.%s action is deprecated and will be removed in "
-                "Home Assistant Core 2027.5",
-                DOMAIN,
-                SERVICE_SEE,
-            )
-            warned_called_see = True
         # Temp workaround for iOS, introduced in 0.65
         data = dict(call.data)
         data.pop("hostname", None)
@@ -343,18 +327,6 @@ class DeviceTrackerPlatform:
             try:
                 scanner = None
                 setup: bool | None = None
-
-                legacy_trackers = hass.data.setdefault(DATA_LEGACY_TRACKERS, set())
-                if full_name not in legacy_trackers:
-                    legacy_trackers.add(full_name)
-                    _LOGGER.warning(
-                        "The legacy device tracker platform %s is being set up; legacy "
-                        "device trackers are deprecated and will be removed in Home "
-                        "Assistant Core 2027.5, please migrate to an integration which "
-                        "uses a modern config entry based device tracker",
-                        full_name,
-                    )
-
                 if hasattr(self.platform, "async_get_scanner"):
                     scanner = await self.platform.async_get_scanner(
                         hass, {DOMAIN: self.config}

homeassistant/components/duco/config_flow.py

@@ -13,7 +13,6 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import DOMAIN
 
@@ -32,46 +31,6 @@ class DucoConfigFlow(ConfigFlow, domain=DOMAIN):
     VERSION = 1
     MINOR_VERSION = 1
 
-    _host: str
-    _box_name: str
-
-    async def async_step_zeroconf(
-        self, discovery_info: ZeroconfServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle zeroconf discovery."""
-        try:
-            box_name, mac = await self._validate_input(discovery_info.host)
-        except DucoConnectionError:
-            return self.async_abort(reason="cannot_connect")
-        except DucoError:
-            _LOGGER.exception("Unexpected error discovering Duco box via zeroconf")
-            return self.async_abort(reason="unknown")
-
-        await self.async_set_unique_id(format_mac(mac))
-        self._abort_if_unique_id_configured(updates={CONF_HOST: discovery_info.host})
-
-        self._host = discovery_info.host
-        self._box_name = box_name
-        self.context["title_placeholders"] = {"name": box_name}
-
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm discovery."""
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self._box_name,
-                data={CONF_HOST: self._host},
-            )
-
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="discovery_confirm",
-            description_placeholders={"name": self._box_name},
-        )
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -87,7 +46,7 @@ class DucoConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected error connecting to Duco box")
                 errors["base"] = "unknown"
             else:
-                await self.async_set_unique_id(format_mac(mac), raise_on_progress=False)
+                await self.async_set_unique_id(format_mac(mac))
                 self._abort_if_unique_id_configured()
 
                 return self.async_create_entry(

homeassistant/components/duco/fan.py

@@ -2,9 +2,7 @@
 
 from __future__ import annotations
 
-import logging
-
-from duco.exceptions import DucoError, DucoRateLimitError
+from duco.exceptions import DucoError
 from duco.models import Node, NodeType, VentilationState
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
@@ -17,8 +15,6 @@ from .const import DOMAIN
 from .coordinator import DucoConfigEntry, DucoCoordinator
 from .entity import DucoEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 # Permanent speed states ordered low → high.
@@ -122,12 +118,6 @@ class DucoVentilationFanEntity(DucoEntity, FanEntity):
             await self.coordinator.client.async_set_ventilation_state(
                 self._node_id, state
             )
-        except DucoRateLimitError as err:
-            _LOGGER.warning("Duco write rate limit exceeded for node %s", self._node_id)
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="rate_limit_exceeded",
-            ) from err
         except DucoError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,

homeassistant/components/duco/manifest.json

@@ -8,11 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["duco"],
   "quality_scale": "bronze",
-  "requirements": ["python-duco-client==0.3.2"],
-  "zeroconf": [
-    {
-      "name": "duco [[][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][]].*",
-      "type": "_http._tcp.local."
-    }
-  ]
+  "requirements": ["python-duco-client==0.3.1"]
 }

homeassistant/components/duco/quality_scale.yaml

@@ -46,8 +46,18 @@ rules:
   # Gold
   devices: done
   diagnostics: done
-  discovery-update-info: done
-  discovery: done
+  discovery-update-info:
+    status: todo
+    comment: >-
+      DHCP host updating to be implemented in a follow-up PR.
+      The device hostname follows the pattern duco_<last 6 chars of MAC>
+      (e.g. duco_061293), which can be used for DHCP hostname matching.
+  discovery:
+    status: todo
+    comment: >-
+      Device can be discovered via DHCP. The hostname follows the pattern
+      duco_<last 6 chars of MAC> (e.g. duco_061293). To be implemented
+      in a follow-up PR together with discovery-update-info.
   docs-data-update: done
   docs-examples: done
   docs-known-limitations: done
@@ -76,4 +86,4 @@ rules:
   # Platinum
   async-dependency: done
   inject-websession: done
-  strict-typing: done
+  strict-typing: todo

homeassistant/components/duco/strings.json

@@ -1,19 +1,13 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
-      "discovery_confirm": {
-        "description": "Do you want to set up {name}?"
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]"
@@ -76,9 +70,6 @@
     },
     "failed_to_set_state": {
       "message": "Failed to set ventilation state: {error}"
-    },
-    "rate_limit_exceeded": {
-      "message": "The Duco device has reached its daily write limit. Try again tomorrow."
     }
   }
 }

homeassistant/components/evohome/button.py

@@ -9,11 +9,10 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import EVOHOME_DATA
 from .coordinator import EvoDataUpdateCoordinator
-from .entity import is_valid_zone, unique_zone_id
+from .entity import EvoEntity, is_valid_zone, unique_zone_id
 
 
 async def async_setup_platform(
@@ -41,22 +40,15 @@ async def async_setup_platform(
 
     async_add_entities(entities)
 
+    for entity in entities:
+        await entity.update_attrs()
 
-class EvoResetButtonBase(CoordinatorEntity[EvoDataUpdateCoordinator], ButtonEntity):
-    """Base for Evohome's Button entities."""
+
+class EvoResetButtonBase(EvoEntity, ButtonEntity):
+    """Base for reset button entities."""
 
     _attr_entity_category = EntityCategory.CONFIG
-
-    _evo_device: evo.ControlSystem | evo.HotWater | evo.Zone
-
-    def __init__(
-        self,
-        coordinator: EvoDataUpdateCoordinator,
-        evo_device: evo.ControlSystem | evo.HotWater | evo.Zone,
-    ) -> None:
-        """Initialize an Evohome reset button entity."""
-        super().__init__(coordinator, context=evo_device.id)
-        self._evo_device = evo_device
+    _evo_state_attr_names = ()
 
     async def async_press(self) -> None:
         """Reset the Evohome entity to its base operating mode."""
@@ -66,7 +58,10 @@ class EvoResetButtonBase(CoordinatorEntity[EvoDataUpdateCoordinator], ButtonEnti
 class EvoResetSystemButton(EvoResetButtonBase):
     """Button entity for system reset."""
 
+    _attr_translation_key = "reset_system_mode"
+
     _evo_device: evo.ControlSystem
+    _evo_id_attr = "system_id"
 
     def __init__(
         self,
@@ -83,7 +78,10 @@ class EvoResetSystemButton(EvoResetButtonBase):
 class EvoResetDhwButton(EvoResetButtonBase):
     """Button entity for DHW override reset."""
 
+    _attr_translation_key = "clear_dhw_override"
+
     _evo_device: evo.HotWater
+    _evo_id_attr = "dhw_id"
 
     def __init__(
         self,
@@ -100,7 +98,10 @@ class EvoResetDhwButton(EvoResetButtonBase):
 class EvoResetZoneButton(EvoResetButtonBase):
     """Button entity for zone override reset."""
 
+    _attr_translation_key = "clear_zone_override"
+
     _evo_device: evo.Zone
+    _evo_id_attr = "zone_id"
 
     def __init__(
         self,

homeassistant/components/evohome/entity.py

@@ -40,7 +40,11 @@ def unique_zone_id(evo_device: evo.Zone) -> str:
 
 
 class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
-    """Base for Evohome's Climate & WaterHeater entities."""
+    """Base for any evohome-compatible entity (controller, DHW, zone).
+
+    This includes the controller, (1 to 12) heating zones and (optionally) a
+    DHW controller.
+    """
 
     _evo_device: evo.ControlSystem | evo.HotWater | evo.Zone
     _evo_id_attr: str

homeassistant/components/firefly_iii/strings.json

@@ -19,7 +19,7 @@
         "data_description": {
           "api_key": "The new API access token for authenticating with Firefly III"
         },
-        "description": "The access token for your Firefly III instance is invalid and needs to be updated. Go to **Options > Remote access and tokens**. Create a new personal access token and copy it (it will only display once)."
+        "description": "The access token for your Firefly III instance is invalid and needs to be updated. Go to **Options > Profile** and select the **OAuth** tab. Create a new personal access token and copy it (it will only display once)."
       },
       "reconfigure": {
         "data": {
@@ -46,7 +46,7 @@
           "url": "[%key:common::config_flow::data::url%]",
           "verify_ssl": "Verify the SSL certificate of the Firefly III instance"
         },
-        "description": "You can create an API key in the Firefly III UI. Go to **Options > Remote access and tokens**. Create a new personal access token and copy it (it will only display once)."
+        "description": "You can create an API key in the Firefly III UI. Go to **Options > Profile** and select the **OAuth** tab. Create a new personal access token and copy it (it will only display once)."
       }
     }
   },

homeassistant/components/frontier_silicon/media_player.py

@@ -26,7 +26,6 @@ from homeassistant.components.media_player import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.util import dt as dt_util
 
 from . import FrontierSiliconConfigEntry
 from .browse_media import browse_node, browse_top_level
@@ -119,8 +118,7 @@ class AFSAPIDevice(MediaPlayerEntity):
             features |= MediaPlayerEntityFeature.REPEAT_SET
         if self.__play_caps & PlayCaps.SHUFFLE:
             features |= MediaPlayerEntityFeature.SHUFFLE_SET
-        if self.__play_caps & PlayCaps.SEEK:
-            features |= MediaPlayerEntityFeature.SEEK
+
         if self._supports_sound_mode:
             features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE
 
@@ -225,21 +223,6 @@ class AFSAPIDevice(MediaPlayerEntity):
             self._attr_is_volume_muted = await afsapi.get_mute()
             self._attr_media_image_url = await afsapi.get_play_graphic()
 
-            if self.__play_caps and self.__play_caps & PlayCaps.SEEK:
-                position_ms = await afsapi.get_play_position()
-                duration_ms = await afsapi.get_play_duration()
-                self._attr_media_position = (
-                    position_ms // 1000 if position_ms is not None else None
-                )
-                self._attr_media_duration = (
-                    duration_ms // 1000 if duration_ms is not None else None
-                )
-                self._attr_media_position_updated_at = dt_util.utcnow()
-            else:
-                self._attr_media_position = None
-                self._attr_media_duration = None
-                self._attr_media_position_updated_at = None
-
             if self._supports_sound_mode:
                 try:
                     eq_preset = await afsapi.get_eq_preset()
@@ -264,9 +247,6 @@ class AFSAPIDevice(MediaPlayerEntity):
             self._attr_is_volume_muted = None
             self._attr_media_image_url = None
             self._attr_sound_mode = None
-            self._attr_media_position = None
-            self._attr_media_duration = None
-            self._attr_media_position_updated_at = None
 
             self._attr_volume_level = None
 
@@ -354,10 +334,6 @@ class AFSAPIDevice(MediaPlayerEntity):
         """Set shuffle mode."""
         await self.fs_device.set_play_shuffle(shuffle)
 
-    async def async_media_seek(self, position: float) -> None:
-        """Seek to a position in seconds."""
-        await self.fs_device.set_play_position(int(position * 1000))
-
     async def async_browse_media(
         self,
         media_content_type: MediaType | str | None = None,

homeassistant/components/hegel/const.py

@@ -81,7 +81,6 @@ MODEL_INPUTS = {
         "XLR 2",
         "Analog 1",
         "Analog 2",
-        "Analog 3",
         "BNC",
         "Coaxial",
         "Optical 1",

homeassistant/components/homeassistant/__init__.py

@@ -452,16 +452,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
                         "arch": arch,
                     },
                 )
-        if not info["docker"] and not info["virtualenv"]:
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                "unsupported_local_deps",
-                learn_more_url=DEPRECATION_URL,
-                is_fixable=False,
-                severity=IssueSeverity.WARNING,
-                translation_key="unsupported_local_deps",
-            )
 
     # Delay deprecation check to make sure installation method is determined correctly
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, _async_check_deprecation)

homeassistant/components/homeassistant/strings.json

@@ -106,12 +106,12 @@
       "title": "[%key:component::homeassistant::issues::deprecated_architecture::title%]"
     },
     "deprecated_method": {
-      "description": "This system is using the {installation_type} installation type, which has been unsupported since Home Assistant 2025.12. To continue receiving updates and support, migrate to a supported installation method.",
-      "title": "Unsupported installation method"
+      "description": "This system is using the {installation_type} installation type, which has been deprecated and will become unsupported following the release of Home Assistant 2025.12. While you can continue using your current setup after that point, we strongly recommend migrating to a supported installation method.",
+      "title": "Deprecation notice: Installation method"
     },
     "deprecated_method_architecture": {
-      "description": "This system is using the {installation_type} installation type, and 32-bit hardware (`{arch}`), both of which have been unsupported since Home Assistant 2025.12. To continue receiving updates and support, migrate to supported hardware and use a supported installation method.",
-      "title": "Unsupported installation method and architecture"
+      "description": "This system is using the {installation_type} installation type, and 32-bit hardware (`{arch}`), both of which have been deprecated and will no longer be supported after the release of Home Assistant 2025.12.",
+      "title": "Deprecation notice"
     },
     "deprecated_os_aarch64": {
       "description": "This system is running on a 32-bit operating system (`armv7`), which has been deprecated and will no longer receive updates after the release of Home Assistant 2025.12. To continue using Home Assistant on this hardware, you will need to install a 64-bit operating system. Please refer to our [installation guide]({installation_guide}).",
@@ -203,10 +203,6 @@
         }
       },
       "title": "Storage corruption detected for {storage_key}"
-    },
-    "unsupported_local_deps": {
-      "description": "This system is running Home Assistant outside a virtual environment or a Docker container. This is not supported and will not work after the release of Home Assistant 2026.11.",
-      "title": "Deprecation notice: Installation method"
     }
   },
   "services": {

homeassistant/components/hydrawise/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["pydrawise"],
-  "requirements": ["pydrawise==2026.4.0"]
+  "requirements": ["pydrawise==2026.3.0"]
 }

homeassistant/components/imgw_pib/icons.json

@@ -4,9 +4,6 @@
       "hydrological_alert": {
         "default": "mdi:alert-octagon-outline"
       },
-      "ice_phenomena": {
-        "default": "mdi:snowflake"
-      },
       "water_flow": {
         "default": "mdi:waves-arrow-right"
       },

homeassistant/components/imgw_pib/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "quality_scale": "platinum",
-  "requirements": ["imgw_pib==2.1.1"]
+  "requirements": ["imgw_pib==2.1.0"]
 }

homeassistant/components/imgw_pib/sensor.py

@@ -16,12 +16,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    PERCENTAGE,
-    UnitOfLength,
-    UnitOfTemperature,
-    UnitOfVolumeFlowRate,
-)
+from homeassistant.const import UnitOfLength, UnitOfTemperature, UnitOfVolumeFlowRate
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -65,14 +60,6 @@ SENSOR_TYPES: tuple[ImgwPibSensorEntityDescription, ...] = (
         value=lambda data: data.hydrological_alert.value,
         attrs=gen_alert_attributes,
     ),
-    ImgwPibSensorEntityDescription(
-        key="ice_phenomena",
-        translation_key="ice_phenomena",
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.ice_phenomena.value,
-        suggested_display_precision=0,
-    ),
     ImgwPibSensorEntityDescription(
         key="water_flow",
         translation_key="water_flow",

homeassistant/components/imgw_pib/strings.json

@@ -59,9 +59,6 @@
           }
         }
       },
-      "ice_phenomena": {
-        "name": "Ice phenomena"
-      },
       "water_flow": {
         "name": "Water flow"
       },

homeassistant/components/jewish_calendar/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/jewish_calendar",
   "iot_class": "calculated",
   "loggers": ["hdate"],
-  "requirements": ["hdate[astral]==1.2.1"],
+  "requirements": ["hdate[astral]==1.1.2"],
   "single_config_entry": true
 }

homeassistant/components/logbook/helpers.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Collection, Mapping
+from collections.abc import Callable, Mapping
 from typing import Any
 
 from homeassistant.components.sensor import ATTR_STATE_CLASS, NON_NUMERIC_DEVICE_CLASSES
@@ -75,12 +75,12 @@ def _async_config_entries_for_ids(
 
 def async_determine_event_types(
     hass: HomeAssistant, entity_ids: list[str] | None, device_ids: list[str] | None
-) -> set[EventType[Any] | str]:
+) -> tuple[EventType[Any] | str, ...]:
     """Reduce the event types based on the entity ids and device ids."""
     logbook_config: LogbookConfig = hass.data[DOMAIN]
     external_events = logbook_config.external_events
     if not entity_ids and not device_ids:
-        return {*BUILT_IN_EVENTS, *external_events}
+        return (*BUILT_IN_EVENTS, *external_events)
 
     interested_domains: set[str] = set()
     for entry_id in _async_config_entries_for_ids(hass, entity_ids, device_ids):
@@ -93,16 +93,16 @@ def async_determine_event_types(
     # to add them since we have historically included
     # them when matching only on entities
     #
-    interested_event_types: set[EventType[Any] | str] = {
+    intrested_event_types: set[EventType[Any] | str] = {
         external_event
         for external_event, domain_call in external_events.items()
         if domain_call[0] in interested_domains
     } | AUTOMATION_EVENTS
     if entity_ids:
         # We also allow entity_ids to be recorded via manual logbook entries.
-        interested_event_types.add(EVENT_LOGBOOK_ENTRY)
+        intrested_event_types.add(EVENT_LOGBOOK_ENTRY)
 
-    return interested_event_types
+    return tuple(intrested_event_types)
 
 
 @callback
@@ -187,7 +187,7 @@ def async_subscribe_events(
     hass: HomeAssistant,
     subscriptions: list[CALLBACK_TYPE],
     target: Callable[[Event[Any]], None],
-    event_types: Collection[EventType[Any] | str],
+    event_types: tuple[EventType[Any] | str, ...],
     entities_filter: Callable[[str], bool] | None,
     entity_ids: list[str] | None,
     device_ids: list[str] | None,

homeassistant/components/logbook/processor.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Collection, Generator, Sequence
+from collections.abc import Callable, Generator, Sequence
 from dataclasses import dataclass, field
 from datetime import datetime as dt
 import logging
@@ -126,7 +126,7 @@ class EventProcessor:
     def __init__(
         self,
         hass: HomeAssistant,
-        event_types: Collection[EventType[Any] | str],
+        event_types: tuple[EventType[Any] | str, ...],
         entity_ids: list[str] | None = None,
         device_ids: list[str] | None = None,
         context_id: str | None = None,

homeassistant/components/logbook/websocket_api.py

@@ -20,6 +20,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.json import json_bytes
 from homeassistant.util import dt as dt_util
 from homeassistant.util.async_ import create_eager_task
+from homeassistant.util.event_type import EventType
 
 from .const import DOMAIN
 from .helpers import (
@@ -365,11 +366,16 @@ async def ws_event_stream(
     # cache parent user_ids as they fire. Historical queries don't — the
     # context_only join fetches them by context_id regardless of type.
     # Unfiltered streams already include it via BUILT_IN_EVENTS.
+    live_event_types: tuple[EventType[Any] | str, ...] = (
+        event_types
+        if EVENT_CALL_SERVICE in event_types
+        else (*event_types, EVENT_CALL_SERVICE)
+    )
     async_subscribe_events(
         hass,
         subscriptions,
         _queue_or_cancel,
-        {*event_types, EVENT_CALL_SERVICE},
+        live_event_types,
         entities_filter,
         entity_ids,
         device_ids,

homeassistant/components/lyric/api.py

@@ -46,11 +46,6 @@ class LyricLocalOAuth2Implementation(
 ):
     """Lyric Local OAuth2 implementation."""
 
-    @property
-    def extra_authorize_data(self) -> dict:
-        """Prompt the user to choose between Resideo and First Alert apps."""
-        return {"appSelect": "1"}
-
     async def _token_request(self, data: dict) -> dict:
         """Make a token request."""
         session = async_get_clientsession(self.hass)

homeassistant/components/matter/manifest.json

@@ -8,6 +8,6 @@
   "documentation": "https://www.home-assistant.io/integrations/matter",
   "integration_type": "hub",
   "iot_class": "local_push",
-  "requirements": ["matter-python-client==0.6.0"],
+  "requirements": ["matter-python-client==0.4.1"],
   "zeroconf": ["_matter._tcp.local.", "_matterc._udp.local."]
 }

homeassistant/components/music_assistant/__init__.py

@@ -53,7 +53,6 @@ PLATFORMS = [
     Platform.BUTTON,
     Platform.MEDIA_PLAYER,
     Platform.NUMBER,
-    Platform.SELECT,
     Platform.SWITCH,
     Platform.TEXT,
 ]

homeassistant/components/music_assistant/select.py

@@ -1,123 +0,0 @@
-"""Music Assistant select platform."""
-
-from __future__ import annotations
-
-from typing import Final
-
-from music_assistant_client.client import MusicAssistantClient
-from music_assistant_models.player import PlayerOption, PlayerOptionType
-
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import MusicAssistantConfigEntry
-from .entity import MusicAssistantPlayerOptionEntity
-from .helpers import catch_musicassistant_error
-
-PLAYER_OPTIONS_SELECT: Final[dict[str, bool]] = {
-    # translation_key: enabled_by_default
-    "dimmer": False,
-    "equalizer_mode": False,
-    "link_audio_delay": True,
-    "link_audio_quality": False,
-    "link_control": False,
-    "sleep": False,
-    "surround_decoder_type": False,
-    "tone_control_mode": True,
-}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: MusicAssistantConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Music Assistant Select Entities (Player Options) from Config Entry."""
-    mass = entry.runtime_data.mass
-
-    def add_player(player_id: str) -> None:
-        """Handle add player."""
-        player = mass.players.get(player_id)
-        if player is None:
-            return
-        entities: list[MusicAssistantPlayerConfigSelect] = []
-        for player_option in player.options:
-            if (
-                not player_option.read_only
-                and player_option.type
-                != PlayerOptionType.BOOLEAN  # these always go to switch
-                and player_option.options
-            ):
-                # We ignore entities with unknown translation key for the base name.
-                # However, we accept a non-available translation_key in strings.json for the entity's state,
-                # as these are oftentimes dynamically created, dependent on a specific player and might not be known to the provider
-                # developer. In that case, the frontend falls back to showing the state's bare translation key.
-                if player_option.translation_key not in PLAYER_OPTIONS_SELECT:
-                    continue
-
-                entities.append(
-                    MusicAssistantPlayerConfigSelect(
-                        mass,
-                        player_id,
-                        player_option=player_option,
-                        entity_description=SelectEntityDescription(
-                            key=player_option.key,
-                            translation_key=player_option.translation_key,
-                            entity_registry_enabled_default=PLAYER_OPTIONS_SELECT[
-                                player_option.translation_key
-                            ],
-                        ),
-                    )
-                )
-        async_add_entities(entities)
-
-    # register callback to add players when they are discovered
-    entry.runtime_data.platform_handlers.setdefault(Platform.SELECT, add_player)
-
-
-class MusicAssistantPlayerConfigSelect(MusicAssistantPlayerOptionEntity, SelectEntity):
-    """Representation of a select entity to control player provider dependent settings."""
-
-    def __init__(
-        self,
-        mass: MusicAssistantClient,
-        player_id: str,
-        player_option: PlayerOption,
-        entity_description: SelectEntityDescription,
-    ) -> None:
-        """Initialize MusicAssistantPlayerConfigSelect."""
-        # this was verified already in the entry callback
-        assert player_option.options is not None
-        # we have to define the dicts before initializing the parent, as this
-        # then calls self.on_player_option_update
-        self._option_translation_key_to_key_mapping = {
-            option.translation_key: option.key for option in player_option.options
-        }
-        self._option_key_to_translation_key_mapping = {
-            option.key: option.translation_key for option in player_option.options
-        }
-
-        super().__init__(mass, player_id, player_option)
-
-        self.entity_description = entity_description
-
-        self._attr_options = list(self._option_translation_key_to_key_mapping.keys())
-
-    @catch_musicassistant_error
-    async def async_select_option(self, option: str) -> None:
-        """Select an option."""
-        await self.mass.players.set_option(
-            self.player_id,
-            self.mass_option_key,
-            self._option_translation_key_to_key_mapping[option],
-        )
-
-    def on_player_option_update(self, player_option: PlayerOption) -> None:
-        """Update on player option update."""
-        self._attr_current_option = (
-            self._option_key_to_translation_key_mapping.get(player_option.value)
-            if isinstance(player_option.value, str)
-            else None
-        )

homeassistant/components/music_assistant/strings.json

@@ -147,80 +147,6 @@
         "name": "Treble"
       }
     },
-    "select": {
-      "dimmer": {
-        "name": "Dimmer",
-        "state": {
-          "auto": "[%key:common::state::auto%]"
-        }
-      },
-      "equalizer_mode": {
-        "name": "Equalizer mode",
-        "state": {
-          "auto": "[%key:common::state::auto%]",
-          "bypass": "Bypass",
-          "manual": "[%key:common::state::manual%]"
-        }
-      },
-      "link_audio_delay": {
-        "name": "Link audio delay",
-        "state": {
-          "audio_sync": "Audio synchronization",
-          "audio_sync_off": "Audio synchronization off",
-          "audio_sync_on": "Audio synchronization on",
-          "balanced": "Balanced",
-          "lip_sync": "Lip synchronization"
-        }
-      },
-      "link_audio_quality": {
-        "name": "Link audio quality",
-        "state": {
-          "compressed": "Compressed",
-          "uncompressed": "Uncompressed"
-        }
-      },
-      "link_control": {
-        "name": "Link control",
-        "state": {
-          "speed": "Speed",
-          "stability": "Stability",
-          "standard": "Standard"
-        }
-      },
-      "sleep": {
-        "name": "Sleep timer",
-        "state": {
-          "0": "[%key:common::state::off%]",
-          "30": "30 minutes",
-          "60": "60 minutes",
-          "90": "90 minutes",
-          "120": "120 minutes"
-        }
-      },
-      "surround_decoder_type": {
-        "name": "Surround decoder type",
-        "state": {
-          "auto": "[%key:common::state::auto%]",
-          "dolby_pl": "Dolby ProLogic",
-          "dolby_pl2x_game": "Dolby ProLogic 2x Game",
-          "dolby_pl2x_movie": "Dolby ProLogic 2x Movie",
-          "dolby_pl2x_music": "Dolby ProLogic 2x Music",
-          "dolby_surround": "Dolby Surround",
-          "dts_neo6_cinema": "DTS Neo:6 Cinema",
-          "dts_neo6_music": "DTS Neo:6 Music",
-          "dts_neural_x": "DTS Neural:X",
-          "toggle": "[%key:common::action::toggle%]"
-        }
-      },
-      "tone_control_mode": {
-        "name": "Tone control mode",
-        "state": {
-          "auto": "[%key:common::state::auto%]",
-          "bypass": "Bypass",
-          "manual": "[%key:common::state::manual%]"
-        }
-      }
-    },
     "switch": {
       "adaptive_drc": {
         "name": "Adaptive DRC"

homeassistant/components/nobo_hub/__init__.py

@@ -7,10 +7,9 @@ from pynobo import nobo
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.util import dt as dt_util
 
-from .const import CONF_AUTO_DISCOVERED, CONF_SERIAL, DOMAIN
+from .const import CONF_AUTO_DISCOVERED, CONF_SERIAL
 
 PLATFORMS = [Platform.CLIMATE, Platform.SELECT, Platform.SENSOR]
 
@@ -21,51 +20,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: NoboHubConfigEntry) -> b
     """Set up Nobø Ecohub from a config entry."""
 
     serial = entry.data[CONF_SERIAL]
-    stored_ip = entry.data[CONF_IP_ADDRESS]
-    auto_discovered = entry.data[CONF_AUTO_DISCOVERED]
-
-    async def _connect(ip: str) -> nobo:
-        hub = nobo(
-            serial=serial,
-            ip=ip,
-            discover=False,
-            synchronous=False,
-            timezone=dt_util.get_default_time_zone(),
-        )
-        await hub.connect()
-        return hub
-
-    try:
-        hub = await _connect(stored_ip)
-    except OSError as err:
-        if not auto_discovered:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect_manual",
-                translation_placeholders={"serial": serial, "ip": stored_ip},
-            ) from err
-        # Stored IP may be stale for an auto-discovered entry - try UDP
-        # rediscovery to pick up a new DHCP lease.
-        discovered = await nobo.async_discover_hubs(serial=serial)
-        if not discovered:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="hub_not_found",
-                translation_placeholders={"serial": serial},
-            ) from err
-        new_ip, _ = next(iter(discovered))
-        try:
-            hub = await _connect(new_ip)
-        except OSError as rediscover_err:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect_rediscovered",
-                translation_placeholders={"ip": new_ip},
-            ) from rediscover_err
-        if new_ip != stored_ip:
-            hass.config_entries.async_update_entry(
-                entry, data={**entry.data, CONF_IP_ADDRESS: new_ip}
-            )
+    discover = entry.data[CONF_AUTO_DISCOVERED]
+    ip_address = None if discover else entry.data[CONF_IP_ADDRESS]
+    hub = nobo(
+        serial=serial,
+        ip=ip_address,
+        discover=discover,
+        synchronous=False,
+        timezone=dt_util.get_default_time_zone(),
+    )
+    await hub.connect()
 
     async def _async_close(event):
         """Close the Nobø Ecohub socket connection when HA stops."""

homeassistant/components/nobo_hub/strings.json

@@ -47,17 +47,6 @@
       }
     }
   },
-  "exceptions": {
-    "cannot_connect_manual": {
-      "message": "Unable to connect to Nobø Ecohub with serial {serial} at {ip}. If the hub has moved to a new IP address, remove and re-add the integration."
-    },
-    "cannot_connect_rediscovered": {
-      "message": "Unable to connect to Nobø Ecohub at rediscovered IP {ip}; will retry."
-    },
-    "hub_not_found": {
-      "message": "Nobø Ecohub with serial {serial} not found on the network. The hub may be offline or on a different subnet; will retry."
-    }
-  },
   "options": {
     "step": {
       "init": {

homeassistant/components/peblar/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "platinum",
-  "requirements": ["peblar==0.5.1"],
+  "requirements": ["peblar==0.4.0"],
   "zeroconf": [{ "name": "pblr-*", "type": "_http._tcp.local." }]
 }

homeassistant/components/pvoutput/config_flow.py

@@ -32,6 +32,8 @@ class PVOutputFlowHandler(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
+    imported_name: str | None = None
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -54,7 +56,7 @@ class PVOutputFlowHandler(ConfigFlow, domain=DOMAIN):
                 await self.async_set_unique_id(str(user_input[CONF_SYSTEM_ID]))
                 self._abort_if_unique_id_configured()
                 return self.async_create_entry(
-                    title=str(user_input[CONF_SYSTEM_ID]),
+                    title=self.imported_name or str(user_input[CONF_SYSTEM_ID]),
                     data={
                         CONF_SYSTEM_ID: user_input[CONF_SYSTEM_ID],
                         CONF_API_KEY: user_input[CONF_API_KEY],

homeassistant/components/pvoutput/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/pvoutput",
   "integration_type": "device",
   "iot_class": "cloud_polling",
-  "requirements": ["pvo==3.0.0"]
+  "requirements": ["pvo==2.2.1"]
 }

homeassistant/components/rituals_perfume_genie/__init__.py

@@ -13,8 +13,8 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import ACCOUNT_HASH, UPDATE_INTERVAL
-from .coordinator import RitualsConfigEntry, RitualsDataUpdateCoordinator
+from .const import ACCOUNT_HASH, DOMAIN, UPDATE_INTERVAL
+from .coordinator import RitualsDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,7 +27,7 @@ PLATFORMS = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: RitualsConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Rituals Perfume Genie from a config entry."""
     # Initiate reauth for old config entries which don't have username / password in the entry data
     if CONF_EMAIL not in entry.data or CONF_PASSWORD not in entry.data:
@@ -87,15 +87,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: RitualsConfigEntry) -> b
         ]
     )
 
-    entry.runtime_data = coordinators
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinators
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: RitualsConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
 
 
 @callback

homeassistant/components/rituals_perfume_genie/binary_sensor.py

@@ -12,11 +12,13 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import RitualsConfigEntry
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 from .entity import DiffuserEntity
 
 PARALLEL_UPDATES = 0
@@ -43,11 +45,13 @@ ENTITY_DESCRIPTIONS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: RitualsConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser binary sensors."""
-    coordinators = config_entry.runtime_data
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
 
     async_add_entities(
         RitualsBinarySensorEntity(coordinator, description)

homeassistant/components/rituals_perfume_genie/coordinator.py

@@ -15,13 +15,11 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-type RitualsConfigEntry = ConfigEntry[dict[str, RitualsDataUpdateCoordinator]]
-
 
 class RitualsDataUpdateCoordinator(DataUpdateCoordinator[None]):
     """Class to manage fetching Rituals Perfume Genie device data from single endpoint."""
 
-    config_entry: RitualsConfigEntry
+    config_entry: ConfigEntry
 
     def __init__(
         self,

homeassistant/components/rituals_perfume_genie/diagnostics.py

@@ -5,9 +5,11 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .coordinator import RitualsConfigEntry
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 
 TO_REDACT = {
     "hublot",
@@ -16,12 +18,15 @@ TO_REDACT = {
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: RitualsConfigEntry
+    hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
     return {
         "diffusers": [
             async_redact_data(coordinator.diffuser.data, TO_REDACT)
-            for coordinator in entry.runtime_data.values()
+            for coordinator in coordinators.values()
         ]
     }

homeassistant/components/rituals_perfume_genie/number.py

@@ -9,10 +9,12 @@ from typing import Any
 from pyrituals import Diffuser
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import RitualsConfigEntry
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 from .entity import DiffuserEntity
 
 PARALLEL_UPDATES = 1
@@ -40,11 +42,13 @@ ENTITY_DESCRIPTIONS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: RitualsConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser numbers."""
-    coordinators = config_entry.runtime_data
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
     async_add_entities(
         RitualsNumberEntity(coordinator, description)
         for coordinator in coordinators.values()

homeassistant/components/rituals_perfume_genie/select.py

@@ -8,11 +8,13 @@ from dataclasses import dataclass
 from pyrituals import Diffuser
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfArea
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import RitualsConfigEntry, RitualsDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 from .entity import DiffuserEntity
 
 PARALLEL_UPDATES = 1
@@ -43,11 +45,13 @@ ENTITY_DESCRIPTIONS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: RitualsConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser select entities."""
-    coordinators = config_entry.runtime_data
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
 
     async_add_entities(
         RitualsSelectEntity(coordinator, description)

homeassistant/components/rituals_perfume_genie/sensor.py

@@ -12,11 +12,13 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import RitualsConfigEntry
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 from .entity import DiffuserEntity
 
 PARALLEL_UPDATES = 0
@@ -59,11 +61,13 @@ ENTITY_DESCRIPTIONS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: RitualsConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser sensors."""
-    coordinators = config_entry.runtime_data
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
 
     async_add_entities(
         RitualsSensorEntity(coordinator, description)

homeassistant/components/rituals_perfume_genie/switch.py

@@ -9,10 +9,12 @@ from typing import Any
 from pyrituals import Diffuser
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import RitualsConfigEntry, RitualsDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import RitualsDataUpdateCoordinator
 from .entity import DiffuserEntity
 
 PARALLEL_UPDATES = 1
@@ -41,11 +43,13 @@ ENTITY_DESCRIPTIONS = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: RitualsConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the diffuser switch."""
-    coordinators = config_entry.runtime_data
+    coordinators: dict[str, RitualsDataUpdateCoordinator] = hass.data[DOMAIN][
+        config_entry.entry_id
+    ]
 
     async_add_entities(
         RitualsSwitchEntity(coordinator, description)

homeassistant/components/roborock/sensor.py

@@ -257,7 +257,6 @@ SENSOR_DESCRIPTIONS = [
     RoborockSensorDescription(
         key="mop_clean_remaining",
         native_unit_of_measurement=UnitOfTime.SECONDS,
-        suggested_unit_of_measurement=UnitOfTime.HOURS,
         device_class=SensorDeviceClass.DURATION,
         value_fn=lambda data: data.status.rdt,
         translation_key="mop_drying_remaining_time",

homeassistant/components/sfr_box/__init__.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+from typing import TYPE_CHECKING
 
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxAuthenticationError, SFRBoxError
@@ -13,13 +14,14 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN, PLATFORMS
+from .const import DOMAIN, PLATFORMS, PLATFORMS_WITH_AUTH
 from .coordinator import SFRConfigEntry, SFRDataUpdateCoordinator, SFRRuntimeData
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
     """Set up SFR box as config entry."""
     box = SFRBox(ip=entry.data[CONF_HOST], client=async_get_clientsession(hass))
+    platforms = PLATFORMS
     has_auth = False
     if (username := entry.data.get(CONF_USERNAME)) and (
         password := entry.data.get(CONF_PASSWORD)
@@ -37,11 +39,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
                 translation_key="unknown_error",
                 translation_placeholders={"error": str(err)},
             ) from err
+        platforms = PLATFORMS_WITH_AUTH
         has_auth = True
 
     data = SFRRuntimeData(
         box=box,
-        has_authentication=has_auth,
         dsl=SFRDataUpdateCoordinator(
             hass, entry, box, "dsl", lambda b: b.dsl_get_info()
         ),
@@ -63,6 +65,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
     # Preload system information
     await data.system.async_config_entry_first_refresh()
     system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     # Preload other coordinators (based on net infrastructure)
     tasks = [data.wan.async_config_entry_first_refresh()]
@@ -87,11 +91,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
     )
 
     entry.runtime_data = data
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, platforms)
 
     return True
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
     """Unload a config entry."""
+    if entry.data.get(CONF_USERNAME) and entry.data.get(CONF_PASSWORD):
+        return await hass.config_entries.async_unload_platforms(
+            entry, PLATFORMS_WITH_AUTH
+        )
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/sfr_box/binary_sensor.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from sfrbox_api.models import DslInfo, FtthInfo, VoipInfo, WanInfo
 
@@ -87,6 +88,8 @@ async def async_setup_entry(
     """Set up the sensors."""
     data = entry.runtime_data
     system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities: list[SFRBoxBinarySensor] = [
         SFRBoxBinarySensor(data.wan, description, system_info)

homeassistant/components/sfr_box/button.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
 from functools import wraps
-from typing import Any, Concatenate
+from typing import TYPE_CHECKING, Any, Concatenate
 
 from sfrbox_api.bridge import SFRBox
 from sfrbox_api.exceptions import SFRBoxError
@@ -78,11 +78,9 @@ async def async_setup_entry(
 ) -> None:
     """Set up the buttons."""
     data = entry.runtime_data
-    if not data.has_authentication:
-        # All buttons currently require authentication
-        return
-
     system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities = [
         SFRBoxButton(data.box, description, system_info) for description in BUTTON_TYPES

homeassistant/components/sfr_box/const.py

@@ -7,4 +7,5 @@ DEFAULT_USERNAME = "admin"
 
 DOMAIN = "sfr_box"
 
-PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.SENSOR]
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
+PLATFORMS_WITH_AUTH = [*PLATFORMS, Platform.BUTTON]

homeassistant/components/sfr_box/coordinator.py

@@ -29,7 +29,6 @@ class SFRRuntimeData:
     """Runtime data for SFR Box."""
 
     box: SFRBox
-    has_authentication: bool
     dsl: SFRDataUpdateCoordinator[DslInfo]
     ftth: SFRDataUpdateCoordinator[FtthInfo]
     system: SFRDataUpdateCoordinator[SystemInfo]

homeassistant/components/sfr_box/sensor.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 from sfrbox_api.models import DslInfo, SystemInfo, VoipInfo, WanInfo
 
@@ -235,6 +236,8 @@ async def async_setup_entry(
     """Set up the sensors."""
     data = entry.runtime_data
     system_info = data.system.data
+    if TYPE_CHECKING:
+        assert system_info is not None
 
     entities: list[SFRBoxSensor] = [
         SFRBoxSensor(data.system, description, system_info)

homeassistant/components/shelly/entity.py

@@ -74,7 +74,7 @@ def async_setup_block_attribute_entities(
 
     for block in coordinator.device.blocks:
         for sensor_id in block.sensor_ids:
-            description = sensors.get((block.type, sensor_id))
+            description = sensors.get((cast(str, block.type), sensor_id))
             if description is None:
                 continue
 

homeassistant/components/shelly/manifest.json

@@ -17,7 +17,7 @@
   "iot_class": "local_push",
   "loggers": ["aioshelly"],
   "quality_scale": "platinum",
-  "requirements": ["aioshelly==13.24.0"],
+  "requirements": ["aioshelly==13.23.1"],
   "zeroconf": [
     {
       "name": "shelly*",

homeassistant/components/shelly/utils.py

@@ -122,7 +122,7 @@ def get_block_number_of_channels(device: BlockDevice, block: Block) -> int:
 
 def get_block_custom_name(device: BlockDevice, block: Block | None) -> str | None:
     """Get custom name from device settings."""
-    if block and (key := block.type + "s") and key in device.settings:
+    if block and (key := cast(str, block.type) + "s") and key in device.settings:
         assert block.channel
 
         if name := device.settings[key][int(block.channel)].get("name"):

homeassistant/components/tailscale/__init__.py

@@ -2,25 +2,30 @@
 
 from __future__ import annotations
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import TailscaleConfigEntry, TailscaleDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import TailscaleDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: TailscaleConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Tailscale from a config entry."""
     coordinator = TailscaleDataUpdateCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: TailscaleConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Tailscale config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        del hass.data[DOMAIN][entry.entry_id]
+    return unload_ok

homeassistant/components/tailscale/binary_sensor.py

@@ -12,15 +12,14 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import TailscaleConfigEntry
+from .const import DOMAIN
 from .entity import TailscaleEntity
 
-PARALLEL_UPDATES = 0
-
 
 @dataclass(frozen=True, kw_only=True)
 class TailscaleBinarySensorEntityDescription(BinarySensorEntityDescription):
@@ -98,11 +97,11 @@ BINARY_SENSORS: tuple[TailscaleBinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: TailscaleConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Tailscale binary sensors based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
         TailscaleBinarySensorEntity(
             coordinator=coordinator,

homeassistant/components/tailscale/coordinator.py

@@ -14,15 +14,13 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import CONF_TAILNET, DOMAIN, LOGGER, SCAN_INTERVAL
 
-type TailscaleConfigEntry = ConfigEntry[TailscaleDataUpdateCoordinator]
-
 
 class TailscaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Device]]):
     """The Tailscale Data Update Coordinator."""
 
-    config_entry: TailscaleConfigEntry
+    config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, config_entry: TailscaleConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         """Initialize the Tailscale coordinator."""
         session = async_get_clientsession(hass)
         self.tailscale = Tailscale(

homeassistant/components/tailscale/diagnostics.py

@@ -6,11 +6,12 @@ import json
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY
 from homeassistant.core import HomeAssistant
 
-from .const import CONF_TAILNET
-from .coordinator import TailscaleConfigEntry
+from .const import CONF_TAILNET, DOMAIN
+from .coordinator import TailscaleDataUpdateCoordinator
 
 TO_REDACT = {
     CONF_API_KEY,
@@ -21,19 +22,16 @@ TO_REDACT = {
     "hostname",
     "machine_key",
     "name",
-    "node_id",
     "node_key",
-    "tailnet_lock_key",
     "user",
 }
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: TailscaleConfigEntry
+    hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
+    coordinator: TailscaleDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
     # Round-trip via JSON to trigger serialization
-    devices = [
-        json.loads(device.to_json()) for device in entry.runtime_data.data.values()
-    ]
+    devices = [json.loads(device.to_json()) for device in coordinator.data.values()]
     return async_redact_data({"devices": devices}, TO_REDACT)

homeassistant/components/tailscale/entity.py

@@ -6,13 +6,15 @@ from tailscale import Device as TailscaleDevice
 
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from .const import DOMAIN
-from .coordinator import TailscaleDataUpdateCoordinator
 
 
-class TailscaleEntity(CoordinatorEntity[TailscaleDataUpdateCoordinator]):
+class TailscaleEntity(CoordinatorEntity):
     """Defines a Tailscale base entity."""
 
     _attr_has_entity_name = True
@@ -20,7 +22,7 @@ class TailscaleEntity(CoordinatorEntity[TailscaleDataUpdateCoordinator]):
     def __init__(
         self,
         *,
-        coordinator: TailscaleDataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator,
         device: TailscaleDevice,
         description: EntityDescription,
     ) -> None:

homeassistant/components/tailscale/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tailscale",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "requirements": ["tailscale==0.7.0"]
+  "requirements": ["tailscale==0.6.2"]
 }

homeassistant/components/tailscale/sensor.py

@@ -13,15 +13,14 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import TailscaleConfigEntry
+from .const import DOMAIN
 from .entity import TailscaleEntity
 
-PARALLEL_UPDATES = 0
-
 
 @dataclass(frozen=True, kw_only=True)
 class TailscaleSensorEntityDescription(SensorEntityDescription):
@@ -55,11 +54,11 @@ SENSORS: tuple[TailscaleSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: TailscaleConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Tailscale sensors based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
     async_add_entities(
         TailscaleSensorEntity(
             coordinator=coordinator,

homeassistant/components/tami4/__init__.py

@@ -4,17 +4,18 @@ from __future__ import annotations
 
 from Tami4EdgeAPI import Tami4EdgeAPI, exceptions
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
 
-from .const import CONF_REFRESH_TOKEN
-from .coordinator import Tami4ConfigEntry, Tami4EdgeCoordinator
+from .const import API, CONF_REFRESH_TOKEN, COORDINATOR, DOMAIN
+from .coordinator import Tami4EdgeCoordinator
 
 PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: Tami4ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up tami4 from a config entry."""
     refresh_token = entry.data.get(CONF_REFRESH_TOKEN)
 
@@ -28,13 +29,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: Tami4ConfigEntry) -> boo
     coordinator = Tami4EdgeCoordinator(hass, entry, api)
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
+        API: api,
+        COORDINATOR: coordinator,
+    }
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: Tami4ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok

homeassistant/components/tami4/button.py

@@ -8,11 +8,12 @@ from Tami4EdgeAPI import Tami4EdgeAPI
 from Tami4EdgeAPI.drink import Drink
 
 from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import Tami4ConfigEntry
+from .const import API, DOMAIN
 from .entity import Tami4EdgeBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -41,12 +42,12 @@ BOIL_WATER_BUTTON = Tami4EdgeButtonEntityDescription(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: Tami4ConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Tami4Edge."""
 
-    api = entry.runtime_data.api
+    api: Tami4EdgeAPI = hass.data[DOMAIN][entry.entry_id][API]
     buttons: list[Tami4EdgeBaseEntity] = [Tami4EdgeButton(api, BOIL_WATER_BUTTON)]
 
     device = await hass.async_add_executor_job(api.get_device)

homeassistant/components/tami4/const.py

@@ -3,3 +3,5 @@
 DOMAIN = "tami4"
 CONF_PHONE = "phone"
 CONF_REFRESH_TOKEN = "refresh_token"
+API = "api"
+COORDINATOR = "coordinator"

homeassistant/components/tami4/coordinator.py

@@ -13,8 +13,6 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 _LOGGER = logging.getLogger(__name__)
 
-type Tami4ConfigEntry = ConfigEntry[Tami4EdgeCoordinator]
-
 
 @dataclass
 class FlattenedWaterQuality:
@@ -39,10 +37,10 @@ class FlattenedWaterQuality:
 class Tami4EdgeCoordinator(DataUpdateCoordinator[FlattenedWaterQuality]):
     """Tami4Edge water quality coordinator."""
 
-    config_entry: Tami4ConfigEntry
+    config_entry: ConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: Tami4ConfigEntry, api: Tami4EdgeAPI
+        self, hass: HomeAssistant, config_entry: ConfigEntry, api: Tami4EdgeAPI
     ) -> None:
         """Initialize the water quality coordinator."""
         super().__init__(
@@ -52,12 +50,12 @@ class Tami4EdgeCoordinator(DataUpdateCoordinator[FlattenedWaterQuality]):
             name="Tami4Edge water quality coordinator",
             update_interval=timedelta(minutes=60),
         )
-        self.api = api
+        self._api = api
 
     async def _async_update_data(self) -> FlattenedWaterQuality:
         """Fetch data from the API endpoint."""
         try:
-            device = await self.hass.async_add_executor_job(self.api.get_device)
+            device = await self.hass.async_add_executor_job(self._api.get_device)
 
             return FlattenedWaterQuality(device.water_quality)
         except exceptions.APIRequestFailedException as ex:

homeassistant/components/tami4/sensor.py

@@ -2,18 +2,22 @@
 
 import logging
 
+from Tami4EdgeAPI import Tami4EdgeAPI
+
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .coordinator import Tami4ConfigEntry, Tami4EdgeCoordinator
+from .const import API, COORDINATOR, DOMAIN
+from .coordinator import Tami4EdgeCoordinator
 from .entity import Tami4EdgeBaseEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -49,15 +53,18 @@ ENTITY_DESCRIPTIONS = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: Tami4ConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Perform the setup for Tami4Edge."""
-    coordinator = entry.runtime_data
+    data = hass.data[DOMAIN][entry.entry_id]
+    api: Tami4EdgeAPI = data[API]
+    coordinator: Tami4EdgeCoordinator = data[COORDINATOR]
 
     async_add_entities(
         Tami4EdgeSensorEntity(
             coordinator=coordinator,
+            api=api,
             entity_description=entity_description,
         )
         for entity_description in ENTITY_DESCRIPTIONS
@@ -74,10 +81,11 @@ class Tami4EdgeSensorEntity(
     def __init__(
         self,
         coordinator: Tami4EdgeCoordinator,
+        api: Tami4EdgeAPI,
         entity_description: SensorEntityDescription,
     ) -> None:
         """Initialize the Tami4Edge sensor entity."""
-        Tami4EdgeBaseEntity.__init__(self, coordinator.api, entity_description)
+        Tami4EdgeBaseEntity.__init__(self, api, entity_description)
         CoordinatorEntity.__init__(self, coordinator)
         self._update_attr()
 

homeassistant/components/thethingsnetwork/__init__.py

@@ -2,16 +2,17 @@
 
 import logging
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_HOST
 from homeassistant.core import HomeAssistant
 
-from .const import PLATFORMS, TTN_API_HOST
-from .coordinator import TTNConfigEntry, TTNCoordinator
+from .const import DOMAIN, PLATFORMS, TTN_API_HOST
+from .coordinator import TTNCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: TTNConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Establish connection with The Things Network."""
 
     _LOGGER.debug(
@@ -24,14 +25,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: TTNConfigEntry) -> bool:
 
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: TTNConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
 
     _LOGGER.debug(
@@ -40,4 +41,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: TTNConfigEntry) -> bool
         entry.data.get(CONF_HOST, TTN_API_HOST),
     )
 
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    # Unload entities created for each supported platform
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        del hass.data[DOMAIN][entry.entry_id]
+    return True

homeassistant/components/thethingsnetwork/coordinator.py

@@ -15,15 +15,13 @@ from .const import CONF_APP_ID, POLLING_PERIOD_S
 
 _LOGGER = logging.getLogger(__name__)
 
-type TTNConfigEntry = ConfigEntry[TTNCoordinator]
-
 
 class TTNCoordinator(DataUpdateCoordinator[TTNClient.DATA_TYPE]):
     """TTN coordinator."""
 
-    config_entry: TTNConfigEntry
+    config_entry: ConfigEntry
 
-    def __init__(self, hass: HomeAssistant, entry: TTNConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,

homeassistant/components/thethingsnetwork/sensor.py

@@ -5,12 +5,12 @@ import logging
 from ttn_client import TTNSensorValue
 
 from homeassistant.components.sensor import SensorEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .const import CONF_APP_ID
-from .coordinator import TTNConfigEntry
+from .const import CONF_APP_ID, DOMAIN
 from .entity import TTNEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -18,12 +18,12 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: TTNConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for TTN."""
 
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
 
     sensors: set[tuple[str, str]] = set()
 

homeassistant/components/todoist/__init__.py

@@ -5,10 +5,12 @@ import logging
 
 from todoist_api_python.api_async import TodoistAPIAsync
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 
-from .coordinator import TodoistConfigEntry, TodoistCoordinator
+from .const import DOMAIN
+from .coordinator import TodoistCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -18,7 +20,7 @@ SCAN_INTERVAL = datetime.timedelta(minutes=1)
 PLATFORMS: list[Platform] = [Platform.CALENDAR, Platform.TODO]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: TodoistConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up todoist from a config entry."""
 
     token = entry.data[CONF_TOKEN]
@@ -26,13 +28,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: TodoistConfigEntry) -> b
     coordinator = TodoistCoordinator(hass, _LOGGER, entry, SCAN_INTERVAL, api, token)
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})
+    hass.data[DOMAIN][entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: TodoistConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok

homeassistant/components/todoist/calendar.py

@@ -16,6 +16,7 @@ from homeassistant.components.calendar import (
     CalendarEntity,
     CalendarEvent,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, CONF_NAME, CONF_TOKEN, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
@@ -59,7 +60,7 @@ from .const import (
     START,
     SUMMARY,
 )
-from .coordinator import TodoistConfigEntry, TodoistCoordinator, flatten_async_pages
+from .coordinator import TodoistCoordinator, flatten_async_pages
 from .types import CalData, CustomProject, ProjectData, TodoistEvent
 from .util import parse_due_date
 
@@ -115,11 +116,11 @@ SCAN_INTERVAL = timedelta(minutes=1)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: TodoistConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Todoist calendar platform config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
     projects = await coordinator.async_get_projects()
     labels = await coordinator.async_get_labels()
 

homeassistant/components/todoist/coordinator.py

@@ -15,8 +15,6 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import MAX_PAGE_SIZE
 
-type TodoistConfigEntry = ConfigEntry[TodoistCoordinator]
-
 T = TypeVar("T")
 
 

homeassistant/components/todoist/todo.py

@@ -12,21 +12,23 @@ from homeassistant.components.todo import (
     TodoListEntity,
     TodoListEntityFeature,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .coordinator import TodoistConfigEntry, TodoistCoordinator
+from .const import DOMAIN
+from .coordinator import TodoistCoordinator
 from .util import parse_due_date
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: TodoistConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Todoist todo platform config entry."""
-    coordinator = entry.runtime_data
+    coordinator: TodoistCoordinator = hass.data[DOMAIN][entry.entry_id]
     projects = await coordinator.async_get_projects()
     async_add_entities(
         TodoistTodoListEntity(coordinator, entry.entry_id, project.id, project.name)

homeassistant/components/toon/__init__.py

@@ -21,7 +21,7 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_AGREEMENT_ID, CONF_MIGRATE, DEFAULT_SCAN_INTERVAL, DOMAIN
-from .coordinator import ToonConfigEntry, ToonDataUpdateCoordinator
+from .coordinator import ToonDataUpdateCoordinator
 from .oauth2 import register_oauth2_implementations
 
 PLATFORMS = [
@@ -94,7 +94,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ToonConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Toon from a config entry."""
     try:
         implementation = await async_get_config_entry_implementation(hass, entry)
@@ -111,7 +111,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ToonConfigEntry) -> bool
     )
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})
+    hass.data[DOMAIN][entry.entry_id] = coordinator
 
     # Register device for the Meter Adapter, since it will have no entities.
     device_registry = dr.async_get(hass)
@@ -144,11 +145,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ToonConfigEntry) -> bool
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ToonConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Toon config entry."""
 
     # Remove webhooks registration
-    await entry.runtime_data.unregister_webhook()
+    await hass.data[DOMAIN][entry.entry_id].unregister_webhook()
 
     # Unload entities for this entry/device.
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    # Cleanup
+    if unload_ok:
+        del hass.data[DOMAIN][entry.entry_id]
+
+    return unload_ok

homeassistant/components/toon/binary_sensor.py

@@ -9,11 +9,12 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
-from .coordinator import ToonConfigEntry, ToonDataUpdateCoordinator
+from .coordinator import ToonDataUpdateCoordinator
 from .entity import (
     ToonBoilerDeviceEntity,
     ToonBoilerModuleDeviceEntity,
@@ -25,11 +26,11 @@ from .entity import (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ToonConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon binary sensor based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
 
     entities = [
         description.cls(coordinator, description)

homeassistant/components/toon/climate.py

@@ -21,23 +21,24 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from . import ToonDataUpdateCoordinator
 from .const import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, DOMAIN
-from .coordinator import ToonConfigEntry, ToonDataUpdateCoordinator
 from .entity import ToonDisplayDeviceEntity
 from .helpers import toon_exception_handler
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ToonConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon binary sensors based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
     async_add_entities([ToonThermostatDevice(coordinator)])
 
 

homeassistant/components/toon/coordinator.py

@@ -24,16 +24,14 @@ from .const import CONF_CLOUDHOOK_URL, DEFAULT_SCAN_INTERVAL, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-type ToonConfigEntry = ConfigEntry[ToonDataUpdateCoordinator]
-
 
 class ToonDataUpdateCoordinator(DataUpdateCoordinator[Status]):
     """Class to manage fetching Toon data from single endpoint."""
 
-    config_entry: ToonConfigEntry
+    config_entry: ConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, entry: ToonConfigEntry, session: OAuth2Session
+        self, hass: HomeAssistant, entry: ConfigEntry, session: OAuth2Session
     ) -> None:
         """Initialize global Toon data updater."""
         self.session = session

homeassistant/components/toon/sensor.py

@@ -10,6 +10,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     UnitOfEnergy,
@@ -21,7 +22,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import CURRENCY_EUR, DOMAIN, VOLUME_CM3, VOLUME_LMIN
-from .coordinator import ToonConfigEntry, ToonDataUpdateCoordinator
+from .coordinator import ToonDataUpdateCoordinator
 from .entity import (
     ToonBoilerDeviceEntity,
     ToonDisplayDeviceEntity,
@@ -36,11 +37,11 @@ from .entity import (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ToonConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Toon sensors based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
 
     entities = [
         description.cls(coordinator, description) for description in SENSOR_ENTITIES

homeassistant/components/toon/switch.py

@@ -13,21 +13,23 @@ from toonapi import (
 )
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import ToonConfigEntry, ToonDataUpdateCoordinator
+from .const import DOMAIN
+from .coordinator import ToonDataUpdateCoordinator
 from .entity import ToonDisplayDeviceEntity, ToonEntity, ToonRequiredKeysMixin
 from .helpers import toon_exception_handler
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ToonConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Toon switches based on a config entry."""
-    coordinator = entry.runtime_data
+    coordinator = hass.data[DOMAIN][entry.entry_id]
 
     async_add_entities(
         [description.cls(coordinator, description) for description in SWITCH_ENTITIES]

homeassistant/components/twentemilieu/quality_scale.yaml

@@ -72,12 +72,7 @@ rules:
   diagnostics: done
   exception-translations: done
   icon-translations: done
-  reconfiguration-flow:
-    status: exempt
-    comment: |
-      The unique ID provided by the service is tied to the address.
-      Changing the address would result in a different unique ID and
-      different waste collection properties.
+  reconfiguration-flow: todo
   dynamic-devices:
     status: exempt
     comment: |

homeassistant/components/ukraine_alarm/__init__.py

@@ -15,32 +15,31 @@ from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN, PLATFORMS
-from .coordinator import UkraineAlarmConfigEntry, UkraineAlarmDataUpdateCoordinator
+from .coordinator import UkraineAlarmDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(
-    hass: HomeAssistant, entry: UkraineAlarmConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ukraine Alarm as config entry."""
     websession = async_get_clientsession(hass)
 
     coordinator = UkraineAlarmDataUpdateCoordinator(hass, entry, websession)
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: UkraineAlarmConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
 
 
 async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:

homeassistant/components/ukraine_alarm/binary_sensor.py

@@ -7,6 +7,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
@@ -24,7 +25,7 @@ from .const import (
     DOMAIN,
     MANUFACTURER,
 )
-from .coordinator import UkraineAlarmConfigEntry, UkraineAlarmDataUpdateCoordinator
+from .coordinator import UkraineAlarmDataUpdateCoordinator
 
 BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
     BinarySensorEntityDescription(
@@ -62,12 +63,12 @@ BINARY_SENSOR_TYPES: tuple[BinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: UkraineAlarmConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Ukraine Alarm binary sensor entities based on a config entry."""
     name = config_entry.data[CONF_NAME]
-    coordinator = config_entry.runtime_data
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
 
     async_add_entities(
         UkraineAlarmSensor(

homeassistant/components/ukraine_alarm/coordinator.py

@@ -21,18 +21,16 @@ _LOGGER = logging.getLogger(__name__)
 
 UPDATE_INTERVAL = timedelta(seconds=10)
 
-type UkraineAlarmConfigEntry = ConfigEntry[UkraineAlarmDataUpdateCoordinator]
-
 
 class UkraineAlarmDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Class to manage fetching Ukraine Alarm API."""
 
-    config_entry: UkraineAlarmConfigEntry
+    config_entry: ConfigEntry
 
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: UkraineAlarmConfigEntry,
+        config_entry: ConfigEntry,
         session: ClientSession,
     ) -> None:
         """Initialize."""

homeassistant/components/unifi/button.py

@@ -46,8 +46,6 @@ from .entity import (
 if TYPE_CHECKING:
     from .hub import UnifiHub
 
-PARALLEL_UPDATES = 1
-
 
 @callback
 def async_port_power_cycle_available_fn(hub: UnifiHub, obj_id: str) -> bool: