Ensure Supervisor is up to date before hassio setup completes

During onboarding, Supervisor may be out of date relative to the core version being installed. Attempt a Supervisor update at the start of async_setup_entry when not yet onboarded: - SupervisorBadRequestError: no update available, proceed normally. - No exception: update was triggered, raise ConfigEntryNotReady to retry once Supervisor has restarted with the new version. - Any other SupervisorError: unexpected failure communicating with Supervisor, raise ConfigEntryNotReady to retry. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-05-24 17:55:24 +02:00 · 2026-05-20 20:10:04 +00:00
345 changed files with 4495 additions and 4985 deletions
@@ -19,6 +19,7 @@ machine/* linguist-generated=true
 mypy.ini linguist-generated=true
 requirements.txt linguist-generated=true
 requirements_all.txt linguist-generated=true
+requirements_test_all.txt linguist-generated=true
 requirements_test_pre_commit.txt linguist-generated=true
 script/hassfest/docker/Dockerfile linguist-generated=true
 .github/workflows/*.lock.yml linguist-generated=true
@@ -1,52 +0,0 @@
-name: Cache and install APT packages
-description: >-
-  Wraps awalsh128/cache-apt-pkgs-action with the workarounds Home Assistant CI
-  needs. Removes the conflicting Microsoft apt source before any apt run, and
-  points the dynamic linker at the host's multiarch lib subdirectories so
-  shared libraries that rely on update-alternatives or postinst-managed paths
-  (eg libblas, liblapack pulled in by ffmpeg) stay reachable since the upstream
-  action does not execute postinst scripts on cache restore.
-
-inputs:
-  packages:
-    description: Space-delimited list of apt packages to install.
-    required: true
-  version:
-    description: Cache version. Bump to invalidate the cache.
-    required: false
-    default: "1"
-  execute_install_scripts:
-    description: >-
-      Pass-through to awalsh128/cache-apt-pkgs-action. Postinst scripts are not
-      actually cached by the upstream action, so this is largely a no-op today.
-    required: false
-    default: "false"
-
-runs:
-  using: composite
-  steps:
-    - name: Remove conflicting Microsoft apt source
-      shell: bash
-      run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - name: Install apt packages via cache
-      uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.5.3
-      with:
-        packages: ${{ inputs.packages }}
-        version: ${{ inputs.version }}
-        execute_install_scripts: ${{ inputs.execute_install_scripts }}
-    - name: Refresh dynamic linker cache
-      shell: bash
-      run: |
-        # awalsh128/cache-apt-pkgs-action does not run postinst scripts on
-        # cache restore, so update-alternatives symlinks (eg the one libblas
-        # creates at /usr/lib/<multiarch>/libblas.so.3) are never produced.
-        # Add every /usr/lib/<multiarch> subdirectory that holds shared
-        # libraries to the ldconfig search path so the dynamic linker still
-        # finds them.  Use dpkg-architecture to derive the host's multiarch
-        # tuple so this works on non-x86_64 runners too.
-        multiarch="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-        find "/usr/lib/${multiarch}" -mindepth 2 -maxdepth 2 \
-          -name '*.so.*' -printf '%h\n' \
-          | sort -u \
-          | sudo tee /etc/ld.so.conf.d/zzz-cache-apt-extras.conf > /dev/null
-        sudo ldconfig
@@ -1,42 +0,0 @@
-name: Set up uv and managed Python
-description: >-
-  Pins uv (avoids the raw.githubusercontent.com manifest fetch on cache miss)
-  and proactively installs the requested Python so cached venvs created with
-  `uv venv` resolve their interpreter symlinks in jobs that only restore the
-  venv. setup-uv alone only sets UV_PYTHON, it does not actually fetch the
-  interpreter until uv first uses it, so jobs that just activate the venv
-  blow up with broken symlinks on cache hit.
-
-inputs:
-  python-version:
-    description: The Python version uv should install and use.
-    required: true
-  uv-version:
-    description: The uv version setup-uv should install.
-    required: true
-
-outputs:
-  python-version:
-    description: The Python version uv reports as installed.
-    value: ${{ steps.uv.outputs.python-version }}
-
-runs:
-  using: composite
-  steps:
-    - name: Set up uv
-      id: uv
-      uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
-      with:
-        version: ${{ inputs.uv-version }}
-        python-version: ${{ inputs.python-version }}
-        # Persist astral's managed Python across jobs so 'uv venv' below is
-        # fast on the second job onwards.
-        cache-python: true
-        # Lint-only and codegen jobs touch no Python deps, so the post-step
-        # cache save would otherwise abort the job.
-        ignore-nothing-to-cache: true
-    - name: Install Python interpreter
-      shell: bash
-      env:
-        PYTHON_VERSION: ${{ inputs.python-version }}
-      run: uv python install "${PYTHON_VERSION}"
@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"75b8b624ba0c144fb4b28cba143d16a47c30de8afae568fa3256c6febe01a68a","compiler_version":"v0.74.4","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"1ad29b8fb97f5df4466be54051779a3188f094d7efb041a8ed55211eab33c5f5","compiler_version":"v0.74.4","strict":true,"agent_id":"copilot"}
 # gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"d3abfe96a194bce3a523ed2093ddedd5704cdf62","version":"v0.74.4"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.46"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.46"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.46"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.9","digest":"sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.9@sha256:64828b42a4482f58fab16509d7f8f495a6d97c972a98a68aff20543531ac0388"},{"image":"ghcr.io/github/github-mcp-server:v1.0.4"},{"image":"node:lts-alpine","digest":"sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f","pinned_image":"node:lts-alpine@sha256:d1b3b4da11eefd5941e7f0b9cf17783fc99d9c6fc34884a665f40a06dbdfc94f"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
@@ -65,9 +65,7 @@ run-name: "Check requirements (AW)"

 jobs:
  activation:
-    needs:
-      - extract_pr_number
-      - pre_activation
+    needs: pre_activation
    # zizmor: ignore[dangerous-triggers] - workflow_run trigger is secured with role and fork validation
    if: >
      (needs.pre_activation.outputs.activated == 'true') && (github.event_name != 'workflow_run' || github.event.workflow_run.repository.id == github.repository_id &&
@@ -191,20 +189,20 @@ jobs:
        run: |
          bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
          {
-          cat << 'GH_AW_PROMPT_198418d99edc7d5b_EOF'
+          cat << 'GH_AW_PROMPT_bb296919e461941b_EOF'
          <system>
-          GH_AW_PROMPT_198418d99edc7d5b_EOF
+          GH_AW_PROMPT_bb296919e461941b_EOF
          cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
          cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
          cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
          cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_198418d99edc7d5b_EOF'
+          cat << 'GH_AW_PROMPT_bb296919e461941b_EOF'
          <safe-output-tools>
          Tools: add_comment, missing_tool, missing_data, noop
          </safe-output-tools>
-          GH_AW_PROMPT_198418d99edc7d5b_EOF
+          GH_AW_PROMPT_bb296919e461941b_EOF
          cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          cat << 'GH_AW_PROMPT_198418d99edc7d5b_EOF'
+          cat << 'GH_AW_PROMPT_bb296919e461941b_EOF'
          <github-context>
          The following GitHub context information is available for this workflow:
          {{#if github.actor}}
@@ -233,12 +231,12 @@ jobs:
          {{/if}}
          </github-context>
          
-          GH_AW_PROMPT_198418d99edc7d5b_EOF
+          GH_AW_PROMPT_bb296919e461941b_EOF
          cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_198418d99edc7d5b_EOF'
+          cat << 'GH_AW_PROMPT_bb296919e461941b_EOF'
          </system>
          {{#runtime-import .github/workflows/check-requirements.md}}
-          GH_AW_PROMPT_198418d99edc7d5b_EOF
+          GH_AW_PROMPT_bb296919e461941b_EOF
          } > "$GH_AW_PROMPT"
      - name: Interpolate variables and render templates
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -316,9 +314,7 @@ jobs:
          retention-days: 1

  agent:
-    needs:
-      - activation
-      - extract_pr_number
+    needs: activation
    runs-on: ubuntu-latest
    permissions:
      actions: read
@@ -389,6 +385,11 @@ jobs:
          name: check-requirements-deterministic
          path: /tmp/gh-aw/deterministic
          run-id: ${{ github.event.workflow_run.id }}
+      - if: github.event.workflow_run.conclusion == 'success'
+        name: Extract PR number from artifact
+        run: |-
+          PR=$(python3 -c 'import json,sys;print(json.load(open("/tmp/gh-aw/deterministic/results.json"))["pr_number"])')
+          echo "PR_NUMBER=${PR}" >> "${GITHUB_ENV}"

      - name: Configure Git credentials
        env:
@@ -453,15 +454,15 @@ jobs:
          mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
          mkdir -p /tmp/gh-aw/safeoutputs
          mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_627e06df80c4e5ad_EOF'
-          {"add_comment":{"max":1,"target":"${{ needs.extract_pr_number.outputs.pr_number }}"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_627e06df80c4e5ad_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_c09f5151c817ddfc_EOF'
+          {"add_comment":{"max":1,"target":"${{ env.PR_NUMBER }}"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_c09f5151c817ddfc_EOF
      - name: Generate Safe Outputs Tools
        env:
          GH_AW_TOOLS_META_JSON: |
            {
              "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Target: ${{ needs.extract_pr_number.outputs.pr_number }}. Supports reply_to_id for discussion threading."
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Target: ${{ env.PR_NUMBER }}. Supports reply_to_id for discussion threading."
              },
              "repo_params": {},
              "dynamic_tools": []
@@ -647,7 +648,7 @@ jobs:
          
          mkdir -p /home/runner/.copilot
          GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_175174907e5a28b4_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d12799b4d7ffe5c2_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
          {
            "mcpServers": {
              "github": {
@@ -691,7 +692,7 @@ jobs:
              "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
            }
          }
-          GH_AW_MCP_CONFIG_175174907e5a28b4_EOF
+          GH_AW_MCP_CONFIG_d12799b4d7ffe5c2_EOF
      - name: Mount MCP servers as CLIs
        id: mount-mcp-clis
        continue-on-error: true
@@ -938,7 +939,6 @@ jobs:
      - activation
      - agent
      - detection
-      - extract_pr_number
      - safe_outputs
    if: >
      always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
@@ -1283,37 +1283,6 @@ jobs:
              }
            }

-  extract_pr_number:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-
-    outputs:
-      pr_number: ${{ steps.extract.outputs.pr_number }}
-    steps:
-      - name: Configure GH_HOST for enterprise compatibility
-        id: ghes-host-config
-        shell: bash
-        run: |
-          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
-          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
-          GH_HOST="${GITHUB_SERVER_URL#https://}"
-          GH_HOST="${GH_HOST#http://}"
-          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
-      - name: Download deterministic-results artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          name: check-requirements-deterministic
-          path: /tmp/deterministic
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Extract PR number from artifact
-        id: extract
-        run: |
-          PR=$(jq -r '.pr_number' /tmp/deterministic/results.json)
-          echo "pr_number=${PR}" >> "${GITHUB_OUTPUT}"
-
  pre_activation:
    runs-on: ubuntu-slim
    outputs:
@@ -1352,7 +1321,6 @@ jobs:
      - activation
      - agent
      - detection
-      - extract_pr_number
    if: (!cancelled()) && needs.agent.result != 'skipped' && needs.detection.result == 'success'
    runs-on: ubuntu-slim
    permissions:
@@ -1425,7 +1393,7 @@ jobs:
          GH_AW_ALLOWED_DOMAINS: "*.pythonhosted.org,anaconda.org,api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,binstar.org,bootstrap.pypa.io,conda.anaconda.org,conda.binstar.org,files.pythonhosted.org,github.com,host.docker.internal,pip.pypa.io,pypi.org,pypi.python.org,raw.githubusercontent.com,registry.npmjs.org,repo.anaconda.com,repo.continuum.io,telemetry.enterprise.githubcopilot.com"
          GITHUB_SERVER_URL: ${{ github.server_url }}
          GITHUB_API_URL: ${{ github.api_url }}
-          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":1,\"target\":\"${{ needs.extract_pr_number.outputs.pr_number }}\"},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":1,\"target\":\"${{ env.PR_NUMBER }}\"},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
        with:
          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
          script: |
@@ -19,30 +19,7 @@ tools:
 safe-outputs:
  add-comment:
    max: 1
-    target: "${{ needs.extract_pr_number.outputs.pr_number }}"
-  needs:
-    - extract_pr_number
-jobs:
-  extract_pr_number:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    outputs:
-      pr_number: ${{ steps.extract.outputs.pr_number }}
-    steps:
-      - name: Download deterministic-results artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: check-requirements-deterministic
-          path: /tmp/deterministic
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract PR number from artifact
-        id: extract
-        run: |
-          PR=$(jq -r '.pr_number' /tmp/deterministic/results.json)
-          echo "pr_number=${PR}" >> "${GITHUB_OUTPUT}"
+    target: "${{ env.PR_NUMBER }}"
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_sha }}
  cancel-in-progress: true
@@ -55,6 +32,11 @@ steps:
      path: /tmp/gh-aw/deterministic
      run-id: ${{ github.event.workflow_run.id }}
      github-token: ${{ secrets.GITHUB_TOKEN }}
+  - name: Extract PR number from artifact
+    if: github.event.workflow_run.conclusion == 'success'
+    run: |
+      PR=$(python3 -c 'import json,sys;print(json.load(open("/tmp/gh-aw/deterministic/results.json"))["pr_number"])')
+      echo "PR_NUMBER=${PR}" >> "${GITHUB_ENV}"
 post-steps:
  - name: Verify agent produced an add_comment safe-output
    if: always() && github.event.workflow_run.conclusion == 'success'
@@ -98,11 +80,10 @@ The deterministic stage uploaded its results to the runner at
 The JSON has this shape:

 - `pr_number` — the PR being checked. The `add_comment` safe-output is
-  already targeted at this PR (a pre-job extracts `pr_number` from the
-  artifact and the workflow wires it into the safe-output config via
-  `needs.extract_pr_number.outputs.pr_number`), so **you do not need to
-  set `item_number` yourself** — just emit `add_comment` with the
-  rendered body.
+  already targeted at this PR (the workflow extracted `pr_number` from
+  the artifact and wired it into the safe-output config), so **you do
+  not need to set `item_number` yourself** — just emit `add_comment`
+  with the rendered body.
 - `needs_agent` — `true` iff any package's check needs resolution.
 - `packages[]` — one entry per changed package. Each entry has:
  - `name`, `old_version` (`null` for a newly added package; otherwise the
@@ -180,10 +161,9 @@ Verify that the package's source repository is publicly reachable.
   - Any other inconclusive result → ⚠️ with a one-line description.

 If `repo_public` resolves to ❌ for a package, **also** mark that
-package's `release_pipeline` and `async_blocking` cells/details as `—`
-(em dash) and explain `Skipped because the source repository is not
-publicly accessible.` — neither check can be performed without a public
-repo.
+package's `release_pipeline` cell/detail as `—` (em dash) and explain
+`Skipped because the source repository is not publicly accessible.` —
+because the release pipeline cannot be inspected without a public repo.

 ### Check kind: `pr_link`

@@ -259,111 +239,6 @@ host from `package.repo_url`, then apply the corresponding checklist.
 3. If no CI config can be retrieved: ⚠️ `Release pipeline could not be
   inspected; hosting provider is not GitHub or GitLab.`

-### Check kind: `async_blocking`
-
-Verify whether the dependency performs blocking I/O inside async code
-paths. Home Assistant runs on a single asyncio event loop, so a library
-that exposes an `async` surface must not call blocking APIs from inside
-its `async def` functions — that stalls the whole loop. A purely sync
-library is fine: Home Assistant integrations are expected to wrap such
-calls in an executor.
-
-**Two modes — pick by inspecting `package.old_version`:**
-
- `old_version` is `null` → **new package**: review the *entire current
-  source tree*. Nothing about this dependency has been vetted before.
- `old_version` is a string → **version bump**: review only the *diff
-  between `old_version` and `new_version`*. The previous version was
-  already accepted, so blocking calls that were present in
-  `old_version` are not regressions; report only what `new_version`
-  introduces.
-
-#### Step 1 — Decide whether the library exposes an async surface
-
-Use the `github` MCP tool (for `github.com` repos) or `web-fetch`
-(other hosts) on `package.repo_url`. Always inspect the tag /
-ref matching `new_version` (e.g. `v{new_version}` or `{new_version}`).
-
- Locate the top-level package directory (usually named after the
-  import name, often equal or close to `package.name`).
- Check `pyproject.toml` / `setup.py` / `setup.cfg` / `README*` for
-  async indicators (`Framework :: AsyncIO` trove classifier, `asyncio`
-  / `aiohttp` / `httpx` / `anyio` in dependencies, an async usage
-  example in the README).
- Grep the package source for `async def`. A handful of `async def`
-  entries in the public modules is enough to treat the library as
-  having an async surface.
-
-If the library is **sync-only** (no `async def` in its public modules
-and no async framework dependency) → ✅
-`Sync-only library; Home Assistant integrations must wrap calls in an
-executor.` *This verdict is the same in both modes.*
-
-#### Step 2a — Mode: new package (`old_version` is `null`)
-
-Inspect **every `async def` in the public modules** for blocking
-patterns. Walk transitively into helpers the async functions call.
-
-#### Step 2b — Mode: version bump (`old_version` is a string)
-
-Fetch the diff between the two tags and review **only changed lines**:
-
- GitHub: `GET /repos/{owner}/{repo}/compare/{old_tag}...{new_tag}` via
-  the `github` MCP tool, or
-  `https://github.com/{owner}/{repo}/compare/{old_tag}...{new_tag}.diff`
-  via `web-fetch`. Try the common tag formats in order until one
-  resolves: `v{version}`, `{version}`, `release-{version}`.
- GitLab: `https://gitlab.com/{namespace}/{project}/-/compare/{old_tag}...{new_tag}.diff`.
- Other hosts: use the project's equivalent compare URL via
-  `web-fetch`.
-
-If neither tag format resolves on the host, fall back to a full review
-(Step 2a) and mention in the detail that the diff was unavailable.
-
-When reviewing the diff, only flag blocking patterns that appear in
-**added lines** *inside or reachable from* an `async def`. A blocking
-call that existed in `old_version` and is unchanged is not a regression
-for this bump.
-
-#### Step 3 — Blocking patterns to look for
-
-In both modes, the patterns to flag inside `async def` bodies are:
-
- Sync HTTP: `requests.`, `urllib.request`, `urllib3.` direct use,
-  `http.client.`, sync `httpx.Client(` / `httpx.get(` (NOT the
-  `AsyncClient`), `pycurl`.
- `time.sleep(` (must be `await asyncio.sleep(`).
- Sync sockets: bare `socket.socket` reads/writes, `ssl.wrap_socket`,
-  blocking `select.select`.
- File I/O: `open(` / `pathlib.Path.read_*` / `.write_*` for
-  non-trivial sizes (small one-shot reads during import are
-  acceptable; reads/writes on the request path are not — prefer
-  `aiofiles` / executor).
- Sync DB drivers used directly: `sqlite3`, `psycopg2`, `pymysql`,
-  `pymongo` (sync client), `redis.Redis` (sync client).
- `subprocess.run` / `subprocess.call` / `os.system` (must be
-  `asyncio.create_subprocess_*`).
-
-A call that is clearly dispatched to an executor
-(`run_in_executor`, `asyncio.to_thread`, `anyio.to_thread.run_sync`)
-does NOT count as blocking.
-
-#### Step 4 — Verdict
-
- ✅ — no offending blocking pattern in the surface being reviewed
-  (whole tree for a new package, added lines for a bump). For a bump,
-  phrase the detail as `No new blocking calls introduced in
-  {old_version} → {new_version}.`.
- ⚠️ — blocking calls exist only in sync helpers that the async API
-  does not call, or only on a clearly non-hot path (e.g. one-shot
-  setup before the event loop is running). Cite at least one
-  `<file>:<line>` and explain why it is not on the hot path.
- ❌ — a blocking call is reachable from an `async def` that is part
-  of the public API on the request / polling path (for a bump: the
-  call was introduced or moved onto the hot path by this version).
-  Cite the offending `<file>:<line>` as a clickable link on the repo
-  host so the contributor can jump to it.
-
 ## Notes

 - Be constructive and helpful. Reference the inspected workflow / CI
@@ -37,7 +37,7 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 4
+  CACHE_VERSION: 3
  MYPY_CACHE_VERSION: 1
  HA_SHORT_VERSION: "2026.6"
  ADDITIONAL_PYTHON_VERSIONS: "[]"
@@ -60,7 +60,9 @@ env:
  # - 15.2 is the latest (as of 9 Feb 2023)
  POSTGRESQL_VERSIONS: "['postgres:12.14','postgres:15.2']"
  UV_CACHE_DIR: /tmp/uv-cache
-  APT_CACHE_VERSION: 1
+  APT_CACHE_BASE: /home/runner/work/apt
+  APT_CACHE_DIR: /home/runner/work/apt/cache
+  APT_LIST_CACHE_DIR: /home/runner/work/apt/lists
  SQLALCHEMY_WARN_20: 1
  PYTHONASYNCIODEBUG: 1
  HASS_CI: 1
@@ -84,13 +86,12 @@ jobs:
      core: ${{ steps.core.outputs.changes }}
      integrations_glob: ${{ steps.info.outputs.integrations_glob }}
      integrations: ${{ steps.integrations.outputs.changes }}
+      apt_cache_key: ${{ steps.generate_apt_cache_key.outputs.key }}
      python_cache_key: ${{ steps.generate_python_cache_key.outputs.key }}
      requirements: ${{ steps.core.outputs.requirements }}
      mariadb_groups: ${{ steps.info.outputs.mariadb_groups }}
      postgresql_groups: ${{ steps.info.outputs.postgresql_groups }}
      python_versions: ${{ steps.info.outputs.python_versions }}
-      default_python: ${{ steps.info.outputs.default_python }}
-      uv_version: ${{ steps.info.outputs.uv_version }}
      test_full_suite: ${{ steps.info.outputs.test_full_suite }}
      test_group_count: ${{ steps.info.outputs.test_group_count }}
      test_groups: ${{ steps.info.outputs.test_groups }}
@@ -115,6 +116,10 @@ jobs:
          # Include HA_SHORT_VERSION to force the immediate creation
          # of a new uv cache entry after a version bump.
          echo "key=venv-${CACHE_VERSION}-${HA_SHORT_VERSION}-${HASH_REQUIREMENTS_TEST}-${HASH_REQUIREMENTS}-${HASH_REQUIREMENTS_ALL}-${HASH_PACKAGE_CONSTRAINTS}-${HASH_GEN_REQUIREMENTS}" >> $GITHUB_OUTPUT
+      - name: Generate partial apt restore key
+        id: generate_apt_cache_key
+        run: |
+          echo "key=$(lsb_release -rs)-apt-${CACHE_VERSION}-${HA_SHORT_VERSION}" >> $GITHUB_OUTPUT
      - name: Filter for core changes
        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
        id: core
@@ -237,11 +242,6 @@ jobs:
          echo "postgresql_groups=${postgresql_groups}" >> $GITHUB_OUTPUT
          echo "python_versions: ${all_python_versions}"
          echo "python_versions=${all_python_versions}" >> $GITHUB_OUTPUT
-          echo "default_python: ${default_python}"
-          echo "default_python=${default_python}" >> $GITHUB_OUTPUT
-          uv_version=$(grep '^uv==' requirements.txt | cut -d'=' -f3)
-          echo "uv_version: ${uv_version}"
-          echo "uv_version=${uv_version}" >> $GITHUB_OUTPUT
          echo "test_full_suite: ${test_full_suite}"
          echo "test_full_suite=${test_full_suite}" >> $GITHUB_OUTPUT
          echo "integrations_glob: ${integrations_glob}"
@@ -351,12 +351,12 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Set up uv and Python ${{ matrix.python-version }}
+      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -384,41 +384,80 @@ jobs:
          path: ${{ env.UV_CACHE_DIR }}
          key: ${{ steps.generate-uv-key.outputs.full_key }}
          restore-keys: ${{ steps.generate-uv-key.outputs.partial_key }}
-      - name: Install additional OS dependencies
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
+      - name: Check if apt cache exists
+        id: cache-apt-check
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-            libxml2-utils
-            libavcodec-dev
-            libavdevice-dev
-            libavfilter-dev
-            libavformat-dev
-            libavutil-dev
-            libswresample-dev
-            libswscale-dev
+          lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        if: |
+          steps.cache-venv.outputs.cache-hit != 'true'
+          || steps.cache-apt-check.outputs.cache-hit != 'true'
+        id: install-os-deps
+        timeout-minutes: 10
+        env:
+          APT_CACHE_HIT: ${{ steps.cache-apt-check.outputs.cache-hit }}
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          if [[ "${APT_CACHE_HIT}" != 'true' ]]; then
+            mkdir -p ${APT_CACHE_DIR}
+            mkdir -p ${APT_LIST_CACHE_DIR}
+          fi
+
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg \
+            libxml2-utils \
+            libavcodec-dev \
+            libavdevice-dev \
+            libavfilter-dev \
+            libavformat-dev \
+            libavutil-dev \
+            libswresample-dev \
+            libswscale-dev \
            libudev-dev
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
+
+          if [[ "${APT_CACHE_HIT}" != 'true' ]]; then
+            sudo chmod -R 755 ${APT_CACHE_BASE}
+          fi
+      - name: Save apt cache
+        if: |
+          always()
+          && steps.cache-apt-check.outputs.cache-hit != 'true'
+          && steps.install-os-deps.outcome == 'success'
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Create Python virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        id: create-venv
-        env:
-          PYTHON_VERSION: ${{ steps.python.outputs.python-version }}
        run: |
-          uv venv venv --python "${PYTHON_VERSION}"
+          python -m venv venv
          . venv/bin/activate
          python --version
+          pip install "$(grep '^uv' < requirements.txt)"
          uv pip install -U "pip>=25.2"
          uv pip install -r requirements.txt
          uv pip install -r requirements_all.txt -r requirements_test.txt
          uv pip install -e . --config-settings editable_mode=compat
      - name: Dump pip freeze
        run: |
+          python -m venv venv
          . venv/bin/activate
          python --version
          uv pip freeze >> pip_freeze.txt
@@ -467,22 +506,36 @@ jobs:
      && github.event.inputs.mypy-only != 'true'
      && github.event.inputs.audit-licenses-only != 'true'
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            libturbojpeg
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: libturbojpeg
-          version: ${{ env.APT_CACHE_VERSION }}
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Restore full Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -516,10 +569,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Restore full Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -552,10 +605,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Run gen_copilot_instructions.py
        run: |
          python -m script.gen_copilot_instructions validate
@@ -607,10 +660,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -658,10 +711,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Restore full Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -711,10 +764,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Restore full Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -762,10 +815,10 @@ jobs:
          persist-credentials: false
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Generate partial mypy restore key
        id: generate-mypy-key
        run: |
@@ -823,26 +876,38 @@ jobs:
      - info
      - base
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
      - name: Set up Python
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
-          python-version: ${{ needs.info.outputs.default_python }}
+          python-version-file: ".python-version"
+          check-latest: true
      - name: Restore full Python virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -887,27 +952,39 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
        group: ${{ fromJson(needs.info.outputs.test_groups) }}
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg \
+            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-            libxml2-utils
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -1028,28 +1105,40 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
        mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg \
+            libmariadb-dev-compat \
+            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-            libmariadb-dev-compat
-            libxml2-utils
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -1177,35 +1266,42 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
        postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg \
+            libxml2-utils
+          sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
+          sudo apt-get -y install \
+            postgresql-server-dev-14
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-            libxml2-utils
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
-      - name: Set up PostgreSQL apt repository
-        run: sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
-      - name: Cache PostgreSQL development headers
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: postgresql-server-dev-14
-          version: ${{ env.APT_CACHE_VERSION }}
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -1353,27 +1449,39 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
        group: ${{ fromJson(needs.info.outputs.test_groups) }}
    steps:
+      - name: Restore apt cache
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: |
+            ${{ env.APT_CACHE_DIR }}
+            ${{ env.APT_LIST_CACHE_DIR }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
+      - name: Install additional OS dependencies
+        timeout-minutes: 10
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR}
+          sudo apt-get -y install \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
+            bluez \
+            ffmpeg \
+            libturbojpeg \
+            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false
-      - name: Install additional OS dependencies
-        timeout-minutes: 10
-        uses: ./.github/actions/cache-apt-packages
-        with:
-          packages: >-
-            bluez
-            ffmpeg
-            libturbojpeg
-            libxml2-utils
-          version: ${{ env.APT_CACHE_VERSION }}
-          execute_install_scripts: true
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: ./.github/actions/setup-uv-python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
-          uv-version: ${{ needs.info.outputs.uv_version }}
          python-version: ${{ matrix.python-version }}
+          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -132,7 +132,7 @@
      "problemMatcher": []
    },
    {
-      "label": "Install all production Requirements",
+      "label": "Install all Requirements",
      "type": "shell",
      "command": "uv pip install -r requirements_all.txt",
      "group": {
@@ -146,9 +146,9 @@
      "problemMatcher": []
    },
    {
-      "label": "Install all (test & production) Requirements",
+      "label": "Install all Test Requirements",
      "type": "shell",
-      "command": "uv pip install -r requirements_all.txt -r requirements_test.txt",
+      "command": "uv pip install -r requirements.txt -r requirements_test_all.txt",
      "group": {
        "kind": "build",
        "isDefault": true
@@ -1413,8 +1413,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/pushover/ @engrbm87
 /homeassistant/components/pvoutput/ @frenck
 /tests/components/pvoutput/ @frenck
-/homeassistant/components/pvpc_hourly_pricing/ @azogue @chiro79
-/tests/components/pvpc_hourly_pricing/ @azogue @chiro79
+/homeassistant/components/pvpc_hourly_pricing/ @azogue
+/tests/components/pvpc_hourly_pricing/ @azogue
 /homeassistant/components/pyload/ @tr4nt0r
 /tests/components/pyload/ @tr4nt0r
 /homeassistant/components/qbittorrent/ @geoffreylagaisse @finder39
@@ -1538,8 +1538,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/saj/ @fredericvl
 /homeassistant/components/samsung_infrared/ @lmaertin
 /tests/components/samsung_infrared/ @lmaertin
-/homeassistant/components/samsungtv/ @chemelli74
-/tests/components/samsungtv/ @chemelli74
+/homeassistant/components/samsungtv/ @chemelli74 @epenet
+/tests/components/samsungtv/ @chemelli74 @epenet
 /homeassistant/components/sanix/ @tomaszsluszniak
 /tests/components/sanix/ @tomaszsluszniak
 /homeassistant/components/satel_integra/ @Tommatheussen
@@ -134,7 +134,7 @@ class AuthManagerFlowManager(
        """
        flow = cast(LoginFlow, flow)

-        if result["type"] is not FlowResultType.CREATE_ENTRY:
+        if result["type"] != FlowResultType.CREATE_ENTRY:
            return result

        # we got final result
@@ -226,7 +226,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
    ) -> SubentryFlowResult:
        """Set initial options."""
        # abort if entry is not loaded
-        if self._get_entry().state is not ConfigEntryState.LOADED:
+        if self._get_entry().state != ConfigEntryState.LOADED:
            return self.async_abort(reason="entry_not_loaded")

        hass_apis: list[SelectOptionDict] = [
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/aosmith",
  "integration_type": "hub",
  "iot_class": "cloud_polling",
-  "requirements": ["py-aosmith==1.0.18"]
+  "requirements": ["py-aosmith==1.0.17"]
 }
@@ -89,7 +89,7 @@ class AOSmithWaterHeaterEntity(AOSmithStatusEntity, WaterHeaterEntity):
    def supported_features(self) -> WaterHeaterEntityFeature:
        """Return the list of supported features."""
        supports_vacation_mode = any(
-            supported_mode.mode is AOSmithOperationMode.VACATION
+            supported_mode.mode == AOSmithOperationMode.VACATION
            for supported_mode in self.device.supported_modes
        )

@@ -122,7 +122,7 @@ class AOSmithWaterHeaterEntity(AOSmithStatusEntity, WaterHeaterEntity):
    @property
    def is_away_mode_on(self) -> bool:
        """Return True if away mode is on."""
-        return self.device.status.current_mode is AOSmithOperationMode.VACATION
+        return self.device.status.current_mode == AOSmithOperationMode.VACATION

    async def async_set_operation_mode(self, operation_mode: str) -> None:
        """Set new target operation mode."""
@@ -369,7 +369,7 @@ class AppleTVManager(DeviceListener):

            attrs[ATTR_MODEL] = (
                dev_info.raw_model
-                if dev_info.model is DeviceModel.Unknown and dev_info.raw_model
+                if dev_info.model == DeviceModel.Unknown and dev_info.raw_model
                else model_str(dev_info.model)
            )
            attrs[ATTR_SW_VERSION] = dev_info.version
@@ -63,7 +63,7 @@ class AppleTVKeyboardFocused(AppleTVEntity, BinarySensorEntity, KeyboardListener
        # Listen to keyboard updates
        atv.keyboard.listener = self
        # Set initial state based on current focus state
-        self._update_state(atv.keyboard.text_focus_state is KeyboardFocusState.Focused)
+        self._update_state(atv.keyboard.text_focus_state == KeyboardFocusState.Focused)

    @callback
    def async_device_disconnected(self) -> None:
@@ -78,7 +78,7 @@ class AppleTVKeyboardFocused(AppleTVEntity, BinarySensorEntity, KeyboardListener

        This is a callback function from pyatv.interface.KeyboardListener.
        """
-        self._update_state(new_state is KeyboardFocusState.Focused)
+        self._update_state(new_state == KeyboardFocusState.Focused)

    def _update_state(self, new_state: bool) -> None:
        """Update and report."""
@@ -354,7 +354,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
            "name": self.atv.name,
            "type": (
                dev_info.raw_model
-                if dev_info.model is DeviceModel.Unknown and dev_info.raw_model
+                if dev_info.model == DeviceModel.Unknown and dev_info.raw_model
                else model_str(dev_info.model)
            ),
        }
@@ -441,12 +441,12 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
            return await self.async_step_password()

        # Figure out, depending on protocol, what kind of pairing is needed
-        if service.pairing is PairingRequirement.Unsupported:
+        if service.pairing == PairingRequirement.Unsupported:
            _LOGGER.debug("%s does not support pairing", self.protocol)
            return await self.async_pair_next_protocol()
-        if service.pairing is PairingRequirement.Disabled:
+        if service.pairing == PairingRequirement.Disabled:
            return await self.async_step_protocol_disabled()
-        if service.pairing is PairingRequirement.NotNeeded:
+        if service.pairing == PairingRequirement.NotNeeded:
            _LOGGER.debug("%s does not require pairing", self.protocol)
            self.credentials[self.protocol.value] = None
            return await self.async_pair_next_protocol()
@@ -457,7 +457,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
        pair_args: dict[str, Any] = {}
        if self.protocol in {Protocol.AirPlay, Protocol.Companion, Protocol.DMAP}:
            pair_args["name"] = "Home Assistant"
-        if self.protocol is Protocol.DMAP:
+        if self.protocol == Protocol.DMAP:
            pair_args["zeroconf"] = await zeroconf.async_get_instance(self.hass)

        # Initiate the pairing process
@@ -139,7 +139,7 @@ class AppleTvMediaPlayer(
        all_features = atv.features.all_features()
        for feature_name, support_flag in SUPPORT_FEATURE_MAPPING.items():
            feature_info = all_features.get(feature_name)
-            if feature_info and feature_info.state is not FeatureState.Unsupported:
+            if feature_info and feature_info.state != FeatureState.Unsupported:
                self._attr_supported_features |= support_flag

        # No need to schedule state update here as that will happen when the first
@@ -188,14 +188,14 @@ class AppleTvMediaPlayer(
            return MediaPlayerState.OFF
        if (
            self._is_feature_available(FeatureName.PowerState)
-            and self.atv.power.power_state is PowerState.Off
+            and self.atv.power.power_state == PowerState.Off
        ):
            return MediaPlayerState.OFF
        if self._playing:
            state = self._playing.device_state
            if state in (DeviceState.Idle, DeviceState.Loading):
                return MediaPlayerState.IDLE
-            if state is DeviceState.Playing:
+            if state == DeviceState.Playing:
                return MediaPlayerState.PLAYING
            if state in (DeviceState.Paused, DeviceState.Seeking, DeviceState.Stopped):
                return MediaPlayerState.PAUSED
@@ -446,7 +446,7 @@ class AppleTvMediaPlayer(
    def shuffle(self) -> bool | None:
        """Boolean if shuffle is enabled."""
        if self._playing and self._is_feature_available(FeatureName.Shuffle):
-            return self._playing.shuffle is not ShuffleState.Off
+            return self._playing.shuffle != ShuffleState.Off
        return None

    def _is_feature_available(self, feature: FeatureName) -> bool:
@@ -506,7 +506,7 @@ class AppleTvMediaPlayer(
            and (self._is_feature_available(FeatureName.TurnOff))
            and (
                not self._is_feature_available(FeatureName.PowerState)
-                or self.atv.power.power_state is PowerState.On
+                or self.atv.power.power_state == PowerState.On
            )
        ):
            await self.atv.power.turn_off()
@@ -59,7 +59,7 @@ def _check_keyboard_focus(atv: AppleTVInterface) -> None:
            translation_domain=DOMAIN,
            translation_key="keyboard_not_available",
        ) from err
-    if focus_state is not KeyboardFocusState.Focused:
+    if focus_state != KeyboardFocusState.Focused:
        raise ServiceValidationError(
            translation_domain=DOMAIN,
            translation_key="keyboard_not_focused",
@@ -1,11 +1,9 @@
 """Config flow to configure the Arcam FMJ component."""

-import socket
 from typing import Any
 from urllib.parse import urlparse

-from arcam.fmj import ConnectionFailed
-from arcam.fmj.client import Client
+from arcam.fmj.client import Client, ConnectionFailed
 from arcam.fmj.utils import get_uniqueid_from_host, get_uniqueid_from_udn
 import voluptuous as vol

@@ -31,19 +29,26 @@ class ArcamFmjFlowHandler(ConfigFlow, domain=DOMAIN):
        await self.async_set_unique_id(uuid)
        self._abort_if_unique_id_configured({CONF_HOST: host, CONF_PORT: port})

-    async def _async_try_connect(self, host: str, port: int) -> None:
-        """Verify the device is reachable."""
+    async def _async_check_and_create(self, host: str, port: int) -> ConfigFlowResult:
        client = Client(host, port)
        try:
            await client.start()
+        except ConnectionFailed:
+            return self.async_abort(reason="cannot_connect")
        finally:
            await client.stop()

+        return self.async_create_entry(
+            title=f"{DEFAULT_NAME} ({host})",
+            data={CONF_HOST: host, CONF_PORT: port},
+        )
+
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Handle a discovered device."""
        errors: dict[str, str] = {}
+
        if user_input is not None:
            uuid = await get_uniqueid_from_host(
                async_get_clientsession(self.hass), user_input[CONF_HOST]
@@ -53,36 +58,18 @@ class ArcamFmjFlowHandler(ConfigFlow, domain=DOMAIN):
                    user_input[CONF_HOST], user_input[CONF_PORT], uuid
                )

-            try:
-                await self._async_try_connect(
-                    user_input[CONF_HOST], user_input[CONF_PORT]
-                )
-            except socket.gaierror:
-                errors["base"] = "invalid_host"
-            except TimeoutError:
-                errors["base"] = "timeout_connect"
-            except ConnectionRefusedError:
-                errors["base"] = "connection_refused"
-            except ConnectionFailed, OSError:
-                errors["base"] = "cannot_connect"
-            else:
-                return self.async_create_entry(
-                    title=f"{DEFAULT_NAME} ({user_input[CONF_HOST]})",
-                    data={
-                        CONF_HOST: user_input[CONF_HOST],
-                        CONF_PORT: user_input[CONF_PORT],
-                    },
-                )
+            return await self._async_check_and_create(
+                user_input[CONF_HOST], user_input[CONF_PORT]
+            )

        fields = {
            vol.Required(CONF_HOST): str,
            vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
        }
-        schema = vol.Schema(fields)
-        if user_input is not None:
-            schema = self.add_suggested_values_to_schema(schema, user_input)

-        return self.async_show_form(step_id="user", data_schema=schema, errors=errors)
+        return self.async_show_form(
+            step_id="user", data_schema=vol.Schema(fields), errors=errors
+        )

    async def async_step_confirm(
        self, user_input: dict[str, Any] | None = None
@@ -92,10 +79,7 @@ class ArcamFmjFlowHandler(ConfigFlow, domain=DOMAIN):
        self.context["title_placeholders"] = placeholders

        if user_input is not None:
-            return self.async_create_entry(
-                title=f"{DEFAULT_NAME} ({self.host})",
-                data={CONF_HOST: self.host, CONF_PORT: self.port},
-            )
+            return await self._async_check_and_create(self.host, self.port)

        return self.async_show_form(
            step_id="confirm", description_placeholders=placeholders
@@ -113,11 +97,6 @@ class ArcamFmjFlowHandler(ConfigFlow, domain=DOMAIN):

        await self._async_set_unique_id_and_update(host, port, uuid)

-        try:
-            await self._async_try_connect(host, port)
-        except ConnectionFailed, OSError:
-            return self.async_abort(reason="cannot_connect")
-
        self.host = host
-        self.port = port
+        self.port = DEFAULT_PORT
        return await self.async_step_confirm()
@@ -263,9 +263,9 @@ class ArcamFmj(ArcamFmjEntity, MediaPlayerEntity):
    def media_channel(self) -> str | None:
        """Channel currently playing."""
        source = self._state.get_source()
-        if source is SourceCodes.DAB:
+        if source == SourceCodes.DAB:
            value = self._state.get_dab_station()
-        elif source is SourceCodes.FM:
+        elif source == SourceCodes.FM:
            value = self._state.get_rds_information()
        else:
            value = None
@@ -274,7 +274,7 @@ class ArcamFmj(ArcamFmjEntity, MediaPlayerEntity):
    @property
    def media_artist(self) -> str | None:
        """Artist of current playing media, music track only."""
-        if self._state.get_source() is SourceCodes.DAB:
+        if self._state.get_source() == SourceCodes.DAB:
            value = self._state.get_dls_pdt()
        else:
            value = None
@@ -5,12 +5,6 @@
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "connection_refused": "Host refused connection",
-      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
-      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]"
-    },
    "flow_title": "{host}",
    "step": {
      "confirm": {
@@ -1355,7 +1355,7 @@ class PipelineRun:
    ) -> bool:
        """Return true if all targeted entities were in the same area as the device."""
        if (
-            intent_response.response_type is not intent.IntentResponseType.ACTION_DONE
+            intent_response.response_type != intent.IntentResponseType.ACTION_DONE
            or not intent_response.matched_states
        ):
            return False
@@ -251,12 +251,12 @@ class AuthProvidersView(HomeAssistantView):

 def _prepare_result_json(result: AuthFlowResult) -> dict[str, Any]:
    """Convert result to JSON serializable dict."""
-    if result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY:
+    if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
        return {
            key: val for key, val in result.items() if key not in ("result", "data")
        }

-    if result["type"] is not data_entry_flow.FlowResultType.FORM:
+    if result["type"] != data_entry_flow.FlowResultType.FORM:
        return result  # type: ignore[return-value]

    data = dict(result)
@@ -289,11 +289,11 @@ class LoginFlowBaseView(HomeAssistantView):
        result: AuthFlowResult,
    ) -> web.Response:
        """Convert the flow result to a response."""
-        if result["type"] is not data_entry_flow.FlowResultType.CREATE_ENTRY:
+        if result["type"] != data_entry_flow.FlowResultType.CREATE_ENTRY:
            # @log_invalid_auth does not work here since it returns HTTP 200.
            # We need to manually log failed login attempts.
            if (
-                result["type"] is data_entry_flow.FlowResultType.FORM
+                result["type"] == data_entry_flow.FlowResultType.FORM
                and (errors := result.get("errors"))
                and errors.get("base")
                in (
@@ -142,9 +142,9 @@ def websocket_depose_mfa(

 def _prepare_result_json(result: data_entry_flow.FlowResult) -> dict[str, Any]:
    """Convert result to JSON serializable dict."""
-    if result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY:
+    if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
        return dict(result)
-    if result["type"] is not data_entry_flow.FlowResultType.FORM:
+    if result["type"] != data_entry_flow.FlowResultType.FORM:
        return result  # type: ignore[return-value]

    data = dict(result)
@@ -273,7 +273,7 @@ async def ws_subscribe_scanner_details(

    def _async_registration_changed(registration: HaScannerRegistration) -> None:
        added_event = HaScannerRegistrationEvent.ADDED
-        event_type = "add" if registration.event is added_event else "remove"
+        event_type = "add" if registration.event == added_event else "remove"
        _async_event_message({event_type: [registration.scanner.details]})

    manager = _get_manager(hass)
@@ -185,6 +185,7 @@ class BSBLANClimate(BSBLanCircuitEntity, ClimateEntity):
        except BSBLANError as err:
            # pylint: disable-next=home-assistant-exception-message-with-translation
            raise HomeAssistantError(
+                "An error occurred while updating the BSBLAN device",
                translation_domain=DOMAIN,
                translation_key="set_data_error",
            ) from err
@@ -158,10 +158,7 @@ def process_service_info(
            )

    # If payload is encrypted and the bindkey is not verified then we need to reauth
-    if (
-        data.encryption_scheme is not EncryptionScheme.NONE
-        and not data.bindkey_verified
-    ):
+    if data.encryption_scheme != EncryptionScheme.NONE and not data.bindkey_verified:
        entry.async_start_reauth(hass, data={"device": data})

    return update
@@ -59,7 +59,7 @@ class BTHomeConfigFlow(ConfigFlow, domain=DOMAIN):
        self._discovery_info = discovery_info
        self._discovered_device = device

-        if device.encryption_scheme is EncryptionScheme.BTHOME_BINDKEY:
+        if device.encryption_scheme == EncryptionScheme.BTHOME_BINDKEY:
            return await self.async_step_get_encryption_key()
        return await self.async_step_bluetooth_confirm()

@@ -125,7 +125,7 @@ class BTHomeConfigFlow(ConfigFlow, domain=DOMAIN):
            self._discovery_info = discovery.discovery_info
            self._discovered_device = discovery.device

-            if discovery.device.encryption_scheme is EncryptionScheme.BTHOME_BINDKEY:
+            if discovery.device.encryption_scheme == EncryptionScheme.BTHOME_BINDKEY:
                return await self.async_step_get_encryption_key()

            return self._async_get_or_create_entry()
@@ -164,7 +164,7 @@ class BTHomeConfigFlow(ConfigFlow, domain=DOMAIN):

        self._discovery_info = device.last_service_info

-        if device.encryption_scheme is EncryptionScheme.BTHOME_BINDKEY:
+        if device.encryption_scheme == EncryptionScheme.BTHOME_BINDKEY:
            return await self.async_step_get_encryption_key()

        # Otherwise there wasn't actually encryption so abort
@@ -45,8 +45,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: CalDavConfigEntry) -> bo
        # on some other unexpected server response.
        _LOGGER.warning("Unexpected CalDAV server response: %s", err)
        return False
-    except requests.Timeout as err:
-        raise ConfigEntryNotReady("Timeout connecting to CalDAV server") from err
    except requests.ConnectionError as err:
        raise ConfigEntryNotReady("Connection error from CalDAV server") from err
    except DAVError as err:
@@ -38,7 +38,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from . import CalDavConfigEntry
 from .api import async_get_calendars
-from .const import TIMEOUT
 from .coordinator import CalDavUpdateCoordinator

 _LOGGER = logging.getLogger(__name__)
@@ -92,12 +91,7 @@ async def async_setup_platform(
    days = config[CONF_DAYS]

    client = caldav.DAVClient(
-        url,
-        None,
-        username,
-        password,
-        ssl_verify_cert=config[CONF_VERIFY_SSL],
-        timeout=TIMEOUT,
+        url, None, username, password, ssl_verify_cert=config[CONF_VERIFY_SSL]
    )

    calendars = await async_get_calendars(hass, client, SUPPORTED_COMPONENT)
@@ -237,7 +231,7 @@ class WebDavCalendarEntity(CoordinatorEntity[CalDavUpdateCoordinator], CalendarE
            await self.hass.async_add_executor_job(
                partial(self.coordinator.calendar.add_event, **item_data),
            )
-        except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+        except (requests.ConnectionError, DAVError) as err:
            raise HomeAssistantError(f"CalDAV save error: {err}") from err

    @callback
@@ -138,7 +138,7 @@ class WebDavTodoListEntity(TodoListEntity):
            )
            # refreshing async otherwise it would take too much time
            self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
-        except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+        except (requests.ConnectionError, DAVError) as err:
            raise HomeAssistantError(f"CalDAV save error: {err}") from err

    async def async_update_todo_item(self, item: TodoItem) -> None:
@@ -150,7 +150,7 @@ class WebDavTodoListEntity(TodoListEntity):
            )
        except NotFoundError as err:
            raise HomeAssistantError(f"Could not find To-do item {uid}") from err
-        except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+        except (requests.ConnectionError, DAVError) as err:
            raise HomeAssistantError(f"CalDAV lookup error: {err}") from err
        vtodo = todo.icalendar_component  # type: ignore[attr-defined]
        vtodo["SUMMARY"] = item.summary or ""
@@ -174,7 +174,7 @@ class WebDavTodoListEntity(TodoListEntity):
            )
            # refreshing async otherwise it would take too much time
            self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
-        except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+        except (requests.ConnectionError, DAVError) as err:
            raise HomeAssistantError(f"CalDAV save error: {err}") from err

    async def async_delete_todo_items(self, uids: list[str]) -> None:
@@ -188,14 +188,14 @@ class WebDavTodoListEntity(TodoListEntity):
            items = await asyncio.gather(*tasks)
        except NotFoundError as err:
            raise HomeAssistantError("Could not find To-do item") from err
-        except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+        except (requests.ConnectionError, DAVError) as err:
            raise HomeAssistantError(f"CalDAV lookup error: {err}") from err

        # Run serially as some CalDAV servers do not support concurrent modifications
        for item in items:
            try:
                await self.hass.async_add_executor_job(item.delete)
-            except (requests.ConnectionError, requests.Timeout, DAVError) as err:
+            except (requests.ConnectionError, DAVError) as err:
                raise HomeAssistantError(f"CalDAV delete error: {err}") from err
        # refreshing async otherwise it would take too much time
        self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
@@ -1,11 +1,12 @@
 """Config flow for the Cert Expiry platform."""

 from collections.abc import Mapping
+import logging
 from typing import Any

 import voluptuous as vol

-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT

 from .const import DEFAULT_PORT, DOMAIN
@@ -18,6 +19,8 @@ from .errors import (
 )
 from .helper import get_cert_expiry_timestamp

+_LOGGER = logging.getLogger(__name__)
+

 class CertexpiryConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow."""
@@ -72,6 +75,9 @@ class CertexpiryConfigFlow(ConfigFlow, domain=DOMAIN):
                    title=title,
                    data={CONF_HOST: host, CONF_PORT: port},
                )
+            if self.source == SOURCE_IMPORT:
+                _LOGGER.error("Config import failed for %s", user_input[CONF_HOST])
+                return self.async_abort(reason="import_failed")
        else:
            user_input = {}
            user_input[CONF_HOST] = ""
@@ -2,6 +2,7 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
+      "import_failed": "Import from config failed",
      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
    },
    "error": {
@@ -110,7 +110,7 @@ class ComelitAlarmEntity(
    @property
    def available(self) -> bool:
        """Return True if alarm is available."""
-        if self._area.human_status is AlarmAreaState.UNKNOWN:
+        if self._area.human_status == AlarmAreaState.UNKNOWN:
            return False
        return super().available

@@ -124,7 +124,7 @@ class ComelitAlarmEntity(
            self._area.human_status,
            self._area.armed,
        )
-        if self._area.human_status is AlarmAreaState.ARMED:
+        if self._area.human_status == AlarmAreaState.ARMED:
            if self._area.armed == ALARM_AREA_ARMED_STATUS[AWAY]:
                return AlarmControlPanelState.ARMED_AWAY
            if self._area.armed == ALARM_AREA_ARMED_STATUS[NIGHT]:
@@ -43,7 +43,7 @@ BINARY_SENSOR_TYPES: Final[tuple[ComelitBinarySensorEntityDescription, ...]] = (
        device_class=BinarySensorDeviceClass.PROBLEM,
        is_on_fn=lambda obj: cast(ComelitVedoAreaObject, obj).anomaly,
        available_fn=lambda obj: (
-            cast(ComelitVedoAreaObject, obj).human_status is not AlarmAreaState.UNKNOWN
+            cast(ComelitVedoAreaObject, obj).human_status != AlarmAreaState.UNKNOWN
        ),
    ),
    ComelitBinarySensorEntityDescription(
@@ -67,7 +67,7 @@ BINARY_SENSOR_TYPES: Final[tuple[ComelitBinarySensorEntityDescription, ...]] = (
        object_type=ALARM_ZONE,
        device_class=BinarySensorDeviceClass.PROBLEM,
        is_on_fn=lambda obj: (
-            cast(ComelitVedoZoneObject, obj).human_status is AlarmZoneState.FAULTY
+            cast(ComelitVedoZoneObject, obj).human_status == AlarmZoneState.FAULTY
        ),
        available_fn=lambda obj: (
            cast(ComelitVedoZoneObject, obj).human_status
@@ -166,12 +166,12 @@ class ComelitVedoSensorEntity(
    @property
    def available(self) -> bool:
        """Sensor availability."""
-        return self._zone_object.human_status is not AlarmZoneState.UNAVAILABLE
+        return self._zone_object.human_status != AlarmZoneState.UNAVAILABLE

    @property
    def native_value(self) -> StateType:
        """Sensor value."""
-        if (status := self._zone_object.human_status) is AlarmZoneState.UNKNOWN:
+        if (status := self._zone_object.human_status) == AlarmZoneState.UNKNOWN:
            return None

        return cast(str, status.value)
@@ -148,7 +148,7 @@ def _prepare_config_flow_result_json(
    prepare_result_json: Callable[[data_entry_flow.FlowResult], dict[str, Any]],
 ) -> dict[str, Any]:
    """Convert result to JSON."""
-    if result["type"] is not data_entry_flow.FlowResultType.CREATE_ENTRY:
+    if result["type"] != data_entry_flow.FlowResultType.CREATE_ENTRY:
        return prepare_result_json(result)

    data = {key: val for key, val in result.items() if key not in ("data", "context")}
@@ -646,7 +646,7 @@ class DefaultAgent(ConversationEntity):
        cache_value = self._intent_cache.get(cache_key)
        if cache_value is not None:
            if (cache_value.result is not None) and (
-                cache_value.stage is IntentMatchingStage.EXPOSED_ENTITIES_ONLY
+                cache_value.stage == IntentMatchingStage.EXPOSED_ENTITIES_ONLY
            ):
                _LOGGER.debug("Got cached result for exposed entities")
                return cache_value.result
@@ -686,7 +686,7 @@ class DefaultAgent(ConversationEntity):
        skip_unexposed_entities_match = False
        if cache_value is not None:
            if (cache_value.result is not None) and (
-                cache_value.stage is IntentMatchingStage.UNEXPOSED_ENTITIES
+                cache_value.stage == IntentMatchingStage.UNEXPOSED_ENTITIES
            ):
                _LOGGER.debug("Got cached result for all entities")
                return cache_value.result
@@ -731,7 +731,7 @@ class DefaultAgent(ConversationEntity):
        skip_unknown_names = False
        if cache_value is not None:
            if (cache_value.result is not None) and (
-                cache_value.stage is IntentMatchingStage.UNKNOWN_NAMES
+                cache_value.stage == IntentMatchingStage.UNKNOWN_NAMES
            ):
                _LOGGER.debug("Got cached result for unknown names")
                return cache_value.result
@@ -1447,7 +1447,7 @@ class DefaultAgent(ConversationEntity):

        response = await self._async_process_intent_result(result, user_input, chat_log)
        if (
-            response.response_type is intent.IntentResponseType.ERROR
+            response.response_type == intent.IntentResponseType.ERROR
            and response.error_code
            not in (
                intent.IntentResponseErrorCode.FAILED_TO_HANDLE,
@@ -1546,7 +1546,7 @@ def _get_match_error_response(
        # device_class only
        return ErrorKey.NO_DEVICE_CLASS, {"device_class": device_class}

-    if (reason is intent.MatchFailedReason.DOMAIN) and constraints.domains:
+    if (reason == intent.MatchFailedReason.DOMAIN) and constraints.domains:
        domain = next(iter(constraints.domains))  # first domain
        if constraints.area_name:
            # domain in area
@@ -1565,7 +1565,7 @@ def _get_match_error_response(
        # domain only
        return ErrorKey.NO_DOMAIN, {"domain": domain}

-    if reason is intent.MatchFailedReason.DUPLICATE_NAME:
+    if reason == intent.MatchFailedReason.DUPLICATE_NAME:
        if constraints.floor_name:
            # duplicate on floor
            return ErrorKey.DUPLICATE_ENTITIES_IN_FLOOR, {
@@ -1582,26 +1582,26 @@ def _get_match_error_response(

        return ErrorKey.DUPLICATE_ENTITIES, {"entity": result.no_match_name}

-    if reason is intent.MatchFailedReason.INVALID_AREA:
+    if reason == intent.MatchFailedReason.INVALID_AREA:
        # Invalid area name
        return ErrorKey.NO_AREA, {"area": result.no_match_name}

-    if reason is intent.MatchFailedReason.INVALID_FLOOR:
+    if reason == intent.MatchFailedReason.INVALID_FLOOR:
        # Invalid floor name
        return ErrorKey.NO_FLOOR, {"floor": result.no_match_name}

-    if reason is intent.MatchFailedReason.FEATURE:
+    if reason == intent.MatchFailedReason.FEATURE:
        # Feature not supported by entity
        return ErrorKey.FEATURE_NOT_SUPPORTED, {}

-    if reason is intent.MatchFailedReason.STATE:
+    if reason == intent.MatchFailedReason.STATE:
        # Entity is not in correct state
        assert constraints.states
        state = next(iter(constraints.states))

        return ErrorKey.ENTITY_WRONG_STATE, {"state": state}

-    if reason is intent.MatchFailedReason.ASSISTANT:
+    if reason == intent.MatchFailedReason.ASSISTANT:
        # Not exposed
        if constraints.name:
            if constraints.area_name:
@@ -80,7 +80,7 @@ async def async_validate_device_automation_config(
    # the checks below which look for a config entry matching the device automation
    # domain
    if (
-        automation_type is DeviceAutomationType.ACTION
+        automation_type == DeviceAutomationType.ACTION
        and validated_config[CONF_DOMAIN] in ENTITY_PLATFORMS
    ):
        # Pass the unvalidated config to avoid mutating the raw config twice
@@ -1,18 +1,11 @@
 """Provide functionality to keep track of devices."""

-import asyncio
-from typing import Any
-
 from homeassistant.const import ATTR_GPS_ACCURACY, STATE_HOME  # noqa: F401
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import discovery
-from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType

 from .config_entry import (  # noqa: F401
-    DATA_COMPONENT,
    BaseScannerEntity,
-    BaseTrackerEntity,
    ScannerEntity,
    ScannerEntityDescription,
    TrackerEntity,
@@ -40,8 +33,6 @@ from .const import (  # noqa: F401
    DEFAULT_TRACK_NEW,
    DOMAIN,
    ENTITY_ID_FORMAT,
-    LOGGER,
-    PLATFORM_TYPE_LEGACY,
    SCAN_INTERVAL,
    SourceType,
 )
@@ -53,9 +44,7 @@ from .legacy import (  # noqa: F401
    SOURCE_TYPES,
    AsyncSeeCallback,
    DeviceScanner,
-    DeviceTracker,
    SeeCallback,
-    async_create_platform_type,
    async_setup_integration as async_setup_legacy_integration,
    see,
 )
@@ -68,43 +57,5 @@ def is_on(hass: HomeAssistant, entity_id: str) -> bool:

 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    """Set up the device tracker."""
-    component = hass.data[DATA_COMPONENT] = EntityComponent[BaseTrackerEntity](
-        LOGGER, DOMAIN, hass, SCAN_INTERVAL
-    )
-    component.config = {}
-    component.register_shutdown()
-
-    # The tracker is loaded in the async_setup_legacy_integration task so
-    # we create a future to avoid waiting on it here so that only
-    # async_platform_discovered will have to wait in the rare event
-    # a custom component still uses the legacy device tracker discovery.
-    tracker_future: asyncio.Future[DeviceTracker] = hass.loop.create_future()
-
-    async def async_platform_discovered(
-        p_type: str, info: dict[str, Any] | None
-    ) -> None:
-        """Load a platform."""
-        platform = await async_create_platform_type(hass, config, p_type, {})
-
-        if platform is None:
-            return
-
-        if platform.type != PLATFORM_TYPE_LEGACY:
-            await component.async_setup_platform(p_type, {}, info)
-            return
-
-        tracker = await tracker_future
-        await platform.async_setup_legacy(hass, tracker, info)
-
-    discovery.async_listen_platform(hass, DOMAIN, async_platform_discovered)
-    #
-    # Legacy and platforms load in a non-awaited tracked task
-    # to ensure device tracker setup can continue and config
-    # entry integrations are not waiting for legacy device
-    # tracker platforms to be set up.
-    #
-    hass.async_create_task(
-        async_setup_legacy_integration(hass, config, tracker_future),
-        eager_start=True,
-    )
+    async_setup_legacy_integration(hass, config)
    return True
@@ -37,7 +37,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+    config_validation as cv,
+    discovery,
+    entity_registry as er,
+)
 from homeassistant.helpers.event import (
    async_track_time_interval,
    async_track_utc_time_change,
@@ -200,7 +204,40 @@ def see(
    hass.services.call(DOMAIN, SERVICE_SEE, data)


-async def async_setup_integration(
+@callback
+def async_setup_integration(hass: HomeAssistant, config: ConfigType) -> None:
+    """Set up the legacy integration."""
+    # The tracker is loaded in the _async_setup_integration task so
+    # we create a future to avoid waiting on it here so that only
+    # async_platform_discovered will have to wait in the rare event
+    # a custom component still uses the legacy device tracker discovery.
+    tracker_future: asyncio.Future[DeviceTracker] = hass.loop.create_future()
+
+    async def async_platform_discovered(
+        p_type: str, info: dict[str, Any] | None
+    ) -> None:
+        """Load a platform."""
+        platform = await async_create_platform_type(hass, config, p_type, {})
+
+        if platform is None or platform.type != PLATFORM_TYPE_LEGACY:
+            return
+
+        tracker = await tracker_future
+        await platform.async_setup_legacy(hass, tracker, info)
+
+    discovery.async_listen_platform(hass, DOMAIN, async_platform_discovered)
+    #
+    # Legacy and platforms load in a non-awaited tracked task
+    # to ensure device tracker setup can continue and config
+    # entry integrations are not waiting for legacy device
+    # tracker platforms to be set up.
+    #
+    hass.async_create_task(
+        _async_setup_integration(hass, config, tracker_future), eager_start=True
+    )
+
+
+async def _async_setup_integration(
    hass: HomeAssistant,
    config: ConfigType,
    tracker_future: asyncio.Future[DeviceTracker],
@@ -261,7 +261,7 @@ class DlnaDmrEntity(MediaPlayerEntity):
        except KeyError, ValueError:
            bootid = None

-        if change is ssdp.SsdpChange.UPDATE:
+        if change == ssdp.SsdpChange.UPDATE:
            # This is an announcement that bootid is about to change
            if self._bootid is not None and self._bootid == bootid:
                # Store the new value (because our old value matches) so that we
@@ -281,7 +281,7 @@ class DlnaDmrEntity(MediaPlayerEntity):
                await self._device_disconnect()
        self._bootid = bootid

-        if change is ssdp.SsdpChange.BYEBYE:
+        if change == ssdp.SsdpChange.BYEBYE:
            # Device is going away
            if self._device:
                # Disconnect from gone device
@@ -290,7 +290,7 @@ class DlnaDmrEntity(MediaPlayerEntity):
            self._ssdp_connect_failed = False

        if (
-            change is ssdp.SsdpChange.ALIVE
+            change == ssdp.SsdpChange.ALIVE
            and not self._device
            and not self._ssdp_connect_failed
        ):
@@ -718,7 +718,7 @@ class DlnaDmrEntity(MediaPlayerEntity):

        # If already playing, or don't want to autoplay, no need to call Play
        autoplay = extra.get("autoplay", True)
-        if self._device.transport_state is TransportState.PLAYING or not autoplay:
+        if self._device.transport_state == TransportState.PLAYING or not autoplay:
            return

        # Play it
@@ -748,7 +748,7 @@ class DlnaDmrEntity(MediaPlayerEntity):
        if not (play_mode := self._device.play_mode):
            return None

-        if play_mode is PlayMode.VENDOR_DEFINED:
+        if play_mode == PlayMode.VENDOR_DEFINED:
            return None

        return play_mode in (PlayMode.SHUFFLE, PlayMode.RANDOM)
@@ -782,10 +782,10 @@ class DlnaDmrEntity(MediaPlayerEntity):
        if not (play_mode := self._device.play_mode):
            return None

-        if play_mode is PlayMode.VENDOR_DEFINED:
+        if play_mode == PlayMode.VENDOR_DEFINED:
            return None

-        if play_mode is PlayMode.REPEAT_ONE:
+        if play_mode == PlayMode.REPEAT_ONE:
            return RepeatMode.ONE

        if play_mode in (PlayMode.REPEAT_ALL, PlayMode.RANDOM):
@@ -236,7 +236,7 @@ class DmsDeviceSource:
        except KeyError, ValueError:
            bootid = None

-        if change is ssdp.SsdpChange.UPDATE:
+        if change == ssdp.SsdpChange.UPDATE:
            # This is an announcement that bootid is about to change
            if self._bootid is not None and self._bootid == bootid:
                # Store the new value (because our old value matches) so that we
@@ -258,7 +258,7 @@ class DmsDeviceSource:
                await self.device_disconnect()
        self._bootid = bootid

-        if change is ssdp.SsdpChange.BYEBYE:
+        if change == ssdp.SsdpChange.BYEBYE:
            # Device is going away
            if self._device:
                # Disconnect from gone device
@@ -267,7 +267,7 @@ class DmsDeviceSource:
            self._ssdp_connect_failed = False

        if (
-            change is ssdp.SsdpChange.ALIVE
+            change == ssdp.SsdpChange.ALIVE
            and not self._device
            and not self._ssdp_connect_failed
        ):
@@ -8,12 +8,6 @@
    },
    "step": {
      "user": {
-        "data": {
-          "download_dir": "Download directory"
-        },
-        "data_description": {
-          "download_dir": "The directory where downloaded files will be stored. This can be an absolute path or a path relative to the Home Assistant configuration directory."
-        },
        "description": "Select a location to get to store downloads. The setup will check if the directory exists."
      }
    }
@@ -15,8 +15,6 @@ _LOGGER = logging.getLogger(__name__)
 class EcobeeBaseEntity(Entity):
    """Base methods for Ecobee entities."""

-    _attr_has_entity_name = True
-
    def __init__(self, data: EcobeeData, thermostat_index: int) -> None:
        """Initiate base methods for Ecobee entities."""
        self.data = data
@@ -1,11 +1,4 @@
 {
-  "entity": {
-    "number": {
-      "fan_min_on_time": {
-        "default": "mdi:fan-clock"
-      }
-    }
-  },
  "services": {
    "create_vacation": {
      "service": "mdi:umbrella-beach"
@@ -24,6 +24,7 @@ class EcobeeNotifyEntity(EcobeeBaseEntity, NotifyEntity):
    """Implement the notification entity for the Ecobee thermostat."""

    _attr_name = None
+    _attr_has_entity_name = True

    def __init__(self, data: EcobeeData, thermostat_index: int) -> None:
        """Initialize the thermostat."""
@@ -74,10 +74,6 @@ async def async_setup_entry(
        )
    )

-    entities.extend(
-        EcobeeFanMinOnTime(data, index) for index in range(len(data.ecobee.thermostats))
-    )
-
    async_add_entities(entities, True)


@@ -90,6 +86,7 @@ class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
    _attr_native_max_value = 60
    _attr_native_step = 5
    _attr_native_unit_of_measurement = UnitOfTime.MINUTES
+    _attr_has_entity_name = True

    def __init__(
        self,
@@ -133,6 +130,7 @@ class EcobeeCompressorMinTemp(EcobeeBaseEntity, NumberEntity):
    """

    _attr_device_class = NumberDeviceClass.TEMPERATURE
+    _attr_has_entity_name = True
    _attr_icon = "mdi:thermometer-off"
    _attr_mode = NumberMode.BOX
    _attr_native_min_value = -25
@@ -167,39 +165,3 @@ class EcobeeCompressorMinTemp(EcobeeBaseEntity, NumberEntity):
        """Set new compressor minimum temperature."""
        self.data.ecobee.set_aux_cutover_threshold(self.thermostat_index, value)
        self.update_without_throttle = True
-
-
-class EcobeeFanMinOnTime(EcobeeBaseEntity, NumberEntity):
-    """Minimum minutes per hour that the fan must run on an ecobee thermostat."""
-
-    _attr_native_min_value = 0
-    _attr_native_max_value = 60
-    _attr_native_step = 5
-    _attr_native_unit_of_measurement = UnitOfTime.MINUTES
-    _attr_translation_key = "fan_min_on_time"
-
-    def __init__(
-        self,
-        data: EcobeeData,
-        thermostat_index: int,
-    ) -> None:
-        """Initialize ecobee fan minimum on time."""
-        super().__init__(data, thermostat_index)
-        self._attr_unique_id = f"{self.base_unique_id}_fan_min_on_time"
-        self.update_without_throttle = False
-
-    async def async_update(self) -> None:
-        """Get the latest state from the thermostat."""
-        if self.update_without_throttle:
-            await self.data.update(no_throttle=True)
-            self.update_without_throttle = False
-        else:
-            await self.data.update()
-        self._attr_native_value = self.thermostat["settings"]["fanMinOnTime"]
-
-    def set_native_value(self, value: float) -> None:
-        """Set new fan minimum on time value."""
-        step = self._attr_native_step
-        aligned_value = int(round(value / step) * step)
-        self.data.ecobee.set_fan_min_on_time(self.thermostat_index, aligned_value)
-        self.update_without_throttle = True
@@ -37,9 +37,6 @@
      "compressor_protection_min_temp": {
        "name": "Compressor minimum temperature"
      },
-      "fan_min_on_time": {
-        "name": "Fan minimum on time"
-      },
      "ventilator_min_type_away": {
        "name": "Ventilator minimum time away"
      },
@@ -53,6 +53,7 @@ async def async_setup_entry(
 class EcobeeVentilator20MinSwitch(EcobeeBaseEntity, SwitchEntity):
    """Represent 20 min timer for an ecobee thermostat with ventilator."""

+    _attr_has_entity_name = True
    _attr_name = "Ventilator 20m Timer"

    def __init__(
@@ -103,6 +104,7 @@ class EcobeeVentilator20MinSwitch(EcobeeBaseEntity, SwitchEntity):
 class EcobeeSwitchAuxHeatOnly(EcobeeBaseEntity, SwitchEntity):
    """Representation of a aux_heat_only ecobee switch."""

+    _attr_has_entity_name = True
    _attr_translation_key = "aux_heat_only"

    def __init__(
@@ -31,7 +31,6 @@ class EkeyEvent(EventEntity):

    _attr_device_class = EventDeviceClass.BUTTON
    _attr_event_types = ["event happened"]
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -150,9 +150,9 @@ class ElevenLabsSTTEntity(SpeechToTextEntity):

        raw_pcm_compatible = (
            metadata.codec == AudioCodecs.PCM
-            and metadata.sample_rate is AudioSampleRates.SAMPLERATE_16000
-            and metadata.channel is AudioChannels.CHANNEL_MONO
-            and metadata.bit_rate is AudioBitRates.BITRATE_16
+            and metadata.sample_rate == AudioSampleRates.SAMPLERATE_16000
+            and metadata.channel == AudioChannels.CHANNEL_MONO
+            and metadata.bit_rate == AudioBitRates.BITRATE_16
        )
        if raw_pcm_compatible:
            file_format = "pcm_s16le_16"
@@ -50,5 +50,5 @@ class ElkBinarySensor(ElkAttachedEntity, BinarySensorEntity):
    def _element_changed(self, element: Element, changeset: dict[str, Any]) -> None:
        # Zone in NORMAL state is OFF; any other state is ON
        self._attr_is_on = bool(
-            self._element.logical_status is not ZoneLogicalStatus.NORMAL
+            self._element.logical_status != ZoneLogicalStatus.NORMAL
        )
@@ -104,7 +104,7 @@ class ElkThermostat(ElkEntity, ClimateEntity):
            ThermostatMode.EMERGENCY_HEAT,
        ):
            return self._element.heat_setpoint
-        if self._element.mode is ThermostatMode.COOL:
+        if self._element.mode == ThermostatMode.COOL:
            return self._element.cool_setpoint
        return None

@@ -162,6 +162,6 @@ class ElkThermostat(ElkEntity, ClimateEntity):
            self._attr_hvac_mode = ELK_TO_HASS_HVAC_MODES[self._element.mode]
            if (
                self._attr_hvac_mode == HVACMode.OFF
-                and self._element.fan is ThermostatFan.ON
+                and self._element.fan == ThermostatFan.ON
            ):
                self._attr_hvac_mode = HVACMode.FAN_ONLY
@@ -56,7 +56,7 @@ class ElkNumberSetting(ElkAttachedEntity, NumberEntity):
    def __init__(self, element: Setting, elk: Any, elk_data: ELKM1Data) -> None:
        """Initialize the number setting."""
        super().__init__(element, elk, elk_data)
-        if element.value_format is SettingFormat.TIMER:
+        if element.value_format == SettingFormat.TIMER:
            self._attr_device_class = NumberDeviceClass.DURATION
            self._attr_native_unit_of_measurement = UnitOfTime.SECONDS

@@ -75,7 +75,7 @@ async def async_setup_entry(
    for setting in elk.settings:
        setting = cast(Setting, setting)
        domain = (
-            "time" if setting.value_format is SettingFormat.TIME_OF_DAY else "number"
+            "time" if setting.value_format == SettingFormat.TIME_OF_DAY else "number"
        )

        orig_unique_id = generate_unique_id(elk_data.prefix, setting)
@@ -288,7 +288,7 @@ class ElkZone(ElkSensor):
    @property
    def temperature_unit(self) -> str | None:
        """Return the temperature unit."""
-        if self._element.definition is ZoneType.TEMPERATURE:
+        if self._element.definition == ZoneType.TEMPERATURE:
            return self._temperature_unit
        return None

@@ -305,18 +305,18 @@ class ElkZone(ElkSensor):
    @property
    def native_unit_of_measurement(self) -> str | None:
        """Return the unit of measurement."""
-        if self._element.definition is ZoneType.TEMPERATURE:
+        if self._element.definition == ZoneType.TEMPERATURE:
            return self._temperature_unit
-        if self._element.definition is ZoneType.ANALOG_ZONE:
+        if self._element.definition == ZoneType.ANALOG_ZONE:
            return UnitOfElectricPotential.VOLT
        return None

    def _element_changed(self, element: Element, changeset: dict[str, Any]) -> None:
-        if self._element.definition is ZoneType.TEMPERATURE:
+        if self._element.definition == ZoneType.TEMPERATURE:
            self._attr_native_value = temperature_to_state(
                self._element.temperature, UNDEFINED_TEMPERATURE
            )
-        elif self._element.definition is ZoneType.ANALOG_ZONE:
+        elif self._element.definition == ZoneType.ANALOG_ZONE:
            self._attr_native_value = f"{self._element.voltage}"
        else:
            self._attr_native_value = pretty_const(self._element.logical_status.name)
@@ -66,7 +66,7 @@ class ElkThermostatEMHeat(ElkEntity, SwitchEntity):
    @property
    def is_on(self) -> bool:
        """Get the current emergency heat status."""
-        return self._element.mode is ThermostatMode.EMERGENCY_HEAT
+        return self._element.mode == ThermostatMode.EMERGENCY_HEAT

    def _elk_set(self, mode: ThermostatMode) -> None:
        """Set the thermostat mode."""
@@ -30,7 +30,7 @@ async def async_setup_entry(
    time_settings = [
        setting
        for setting in cast(list[Setting], elk.settings)
-        if setting.value_format is SettingFormat.TIME_OF_DAY
+        if setting.value_format == SettingFormat.TIME_OF_DAY
    ]

    create_elk_entities(
@@ -96,7 +96,7 @@ def __get_coordinator(call: ServiceCall) -> EnergyZeroDataUpdateCoordinator:
                "config_entry": entry_id,
            },
        )
-    if entry.state is not ConfigEntryState.LOADED:
+    if entry.state != ConfigEntryState.LOADED:
        raise ServiceValidationError(
            translation_domain=DOMAIN,
            translation_key="unloaded_config_entry",
@@ -125,7 +125,7 @@ async def __get_prices(

    data: Electricity | Gas

-    if price_type is PriceType.GAS:
+    if price_type == PriceType.GAS:
        data = await coordinator.energyzero.get_gas_prices_legacy(
            start_date=start,
            end_date=end,
@@ -24,7 +24,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: FastdotcomConfigEntry) -

    async def _async_finish_startup(hass: HomeAssistant) -> None:
        """Run this only when HA has finished its startup."""
-        if entry.state is ConfigEntryState.LOADED:
+        if entry.state == ConfigEntryState.LOADED:
            await coordinator.async_refresh()
        else:
            await coordinator.async_config_entry_first_refresh()
@@ -284,7 +284,7 @@ class FishAudioSubentryFlowHandler(ConfigSubentryFlow):
    ) -> SubentryFlowResult:
        """Manage initial options."""
        entry = self._get_entry()
-        if entry.state is not ConfigEntryState.LOADED:
+        if entry.state != ConfigEntryState.LOADED:
            return self.async_abort(reason="entry_not_loaded")

        self.client = entry.runtime_data
@@ -509,12 +509,14 @@ FITBIT_RESOURCE_BATTERY = FitbitSensorEntityDescription(
    icon="mdi:battery",
    scope=FitbitScope.DEVICE,
    entity_category=EntityCategory.DIAGNOSTIC,
+    has_entity_name=True,
 )
 FITBIT_RESOURCE_BATTERY_LEVEL = FitbitSensorEntityDescription(
    key="devices/battery_level",
    translation_key="battery_level",
    scope=FitbitScope.DEVICE,
    entity_category=EntityCategory.DIAGNOSTIC,
+    has_entity_name=True,
    device_class=SensorDeviceClass.BATTERY,
    native_unit_of_measurement=PERCENTAGE,
 )
@@ -652,7 +654,6 @@ class FitbitBatterySensor(CoordinatorEntity[FitbitDeviceCoordinator], SensorEnti

    entity_description: FitbitSensorEntityDescription
    _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -712,7 +713,6 @@ class FitbitBatteryLevelSensor(
    """Implementation of a Fitbit battery level sensor."""

    entity_description: FitbitSensorEntityDescription
-    _attr_has_entity_name = True
    _attr_attribution = ATTRIBUTION

    def __init__(
@@ -109,7 +109,7 @@ def setup_service(hass: HomeAssistant) -> None:
        entry: FlumeConfigEntry | None = hass.config_entries.async_get_entry(entry_id)
        if not entry:
            raise ValueError(f"Invalid config entry: {entry_id}")
-        if entry.state is not ConfigEntryState.LOADED:
+        if not entry.state == ConfigEntryState.LOADED:
            raise ValueError(f"Config entry not loaded: {entry_id}")
        return {
            "notifications": entry.runtime_data.notifications_coordinator.notifications  # type: ignore[dict-item]
@@ -136,7 +136,7 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
                    ConfigEntryState.SETUP_IN_PROGRESS,
                    ConfigEntryState.NOT_LOADED,
                )
-            ) or entry.state is ConfigEntryState.SETUP_RETRY:
+            ) or entry.state == ConfigEntryState.SETUP_RETRY:
                self.hass.config_entries.async_schedule_reload(entry.entry_id)
            else:
                async_dispatcher_send(
@@ -51,7 +51,7 @@ async def async_setup_entry(
    entry.data.get(CONF_NAME, entry.title)
    base_unique_id = entry.unique_id or entry.entry_id

-    if device.device_type is DeviceType.Switch:
+    if device.device_type == DeviceType.Switch:
        entities.append(FluxPowerStateSelect(coordinator.device, entry))
    if device.operating_modes:
        entities.append(
@@ -32,7 +32,7 @@ async def async_setup_entry(
    entities: list[FluxSwitch | FluxRemoteAccessSwitch | FluxMusicSwitch] = []
    base_unique_id = entry.unique_id or entry.entry_id

-    if coordinator.device.device_type is DeviceType.Switch:
+    if coordinator.device.device_type == DeviceType.Switch:
        entities.append(FluxSwitch(coordinator, base_unique_id, None))

    if entry.data.get(CONF_REMOTE_ACCESS_HOST):
@@ -9,12 +9,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import (
-    PERCENTAGE,
-    EntityCategory,
-    UnitOfDataRate,
-    UnitOfTemperature,
-)
+from homeassistant.const import PERCENTAGE, UnitOfDataRate, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -50,7 +45,6 @@ CALL_SENSORS: tuple[SensorEntityDescription, ...] = (
        translation_key="missed",
        native_unit_of_measurement="calls",
        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
    ),
 )

@@ -59,7 +53,6 @@ DISK_PARTITION_SENSORS: tuple[SensorEntityDescription, ...] = (
        key="partition_free_space",
        translation_key="partition_free_space",
        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
    ),
 )

@@ -87,7 +80,6 @@ async def async_setup_entry(
                native_unit_of_measurement=UnitOfTemperature.CELSIUS,
                device_class=SensorDeviceClass.TEMPERATURE,
                state_class=SensorStateClass.MEASUREMENT,
-                entity_category=EntityCategory.DIAGNOSTIC,
            ),
        )
        for sensor_id, sensor_name in router.sensors_temperature_names.items()
@@ -6,6 +6,7 @@ from typing import Any
 from freebox_api.exceptions import InsufficientPermissionsError

 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -18,6 +19,7 @@ SWITCH_DESCRIPTIONS = [
    SwitchEntityDescription(
        key="wifi",
        translation_key="wifi",
+        entity_category=EntityCategory.CONFIG,
    )
 ]

@@ -438,7 +438,6 @@ class FritzBoxBaseSwitch(FritzBoxBaseEntity, SwitchEntity):
        self._attr_is_on = turn_on


-# pylint: disable-next=home-assistant-missing-has-entity-name
 class FritzBoxPortSwitch(FritzBoxBaseSwitch):
    """Defines a FRITZ!Box Tools PortForward switch."""

@@ -605,7 +604,6 @@ class FritzBoxProfileSwitch(FritzBoxBaseCoordinatorSwitch):
        self.async_write_ha_state()


-# pylint: disable-next=home-assistant-missing-has-entity-name
 class FritzBoxWifiSwitch(FritzBoxBaseSwitch):
    """Defines a FRITZ!Box Tools Wifi switch."""

@@ -212,7 +212,7 @@ class FroniusSolarNet:
                inverter_info=_inverter_info,
                config_entry=self.config_entry,
            )
-            if self.config_entry.state is ConfigEntryState.LOADED:
+            if self.config_entry.state == ConfigEntryState.LOADED:
                await _coordinator.async_refresh()
            else:
                await _coordinator.async_config_entry_first_refresh()
@@ -220,7 +220,7 @@ class FroniusSolarNet:

            # Only for re-scans. Initial setup adds entities
            # through sensor.async_setup_entry
-            if self.config_entry.state is ConfigEntryState.LOADED:
+            if self.config_entry.state == ConfigEntryState.LOADED:
                async_dispatcher_send(self.hass, SOLAR_NET_DISCOVERY_NEW, _coordinator)

            _LOGGER.debug(
@@ -235,7 +235,7 @@ class FroniusSolarNet:
        try:
            _inverter_info = await self.fronius.inverter_info()
        except FroniusError as err:
-            if self.config_entry.state is ConfigEntryState.LOADED:
+            if self.config_entry.state == ConfigEntryState.LOADED:
                # During a re-scan we will attempt again as per schedule.
                _LOGGER.debug("Re-scan failed for %s", self.host)
                return inverter_infos
@@ -42,7 +42,7 @@ async def _collect_coordinators(
            raise HomeAssistantError(f"Device '{target}' not found in device registry")
    coordinators = list[FullyKioskDataUpdateCoordinator]()
    for config_entry in config_entries:
-        if config_entry.state is not ConfigEntryState.LOADED:
+        if config_entry.state != ConfigEntryState.LOADED:
            raise HomeAssistantError(f"{config_entry.title} is not loaded")
        coordinators.append(config_entry.runtime_data)
    return coordinators
@@ -75,7 +75,7 @@ async def async_setup_entry(

    mfg_data = await async_get_manufacturer_data({address})
    product_type = mfg_data[address].product_type
-    if product_type is ProductType.UNKNOWN:
+    if product_type == ProductType.UNKNOWN:
        raise ConfigEntryNotReady("Unable to find product type")

    client = Client(get_connection(hass, address), product_type)
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioghost"],
  "quality_scale": "gold",
-  "requirements": ["aioghost==0.4.16"]
+  "requirements": ["aioghost==0.4.0"]
 }
@@ -143,7 +143,7 @@ def _get_entity_descriptions(
        local_sync = True
        if (
            search := data.get(CONF_SEARCH)
-        ) or calendar_item.access_role is AccessRole.FREE_BUSY_READER:
+        ) or calendar_item.access_role == AccessRole.FREE_BUSY_READER:
            read_only = True
            local_sync = False
        entity_description = GoogleCalendarEntityDescription(
@@ -386,14 +386,14 @@ class GoogleCalendarEntity(
        """Return True if the event is visible and not declined."""

        if any(
-            attendee.is_self and attendee.response_status is ResponseStatus.DECLINED
+            attendee.is_self and attendee.response_status == ResponseStatus.DECLINED
            for attendee in event.attendees
        ):
            return False
        # Calendar enttiy may be limited to a specific event type
        if (
            self.entity_description.event_type is not None
-            and self.entity_description.event_type is not event.event_type
+            and self.entity_description.event_type != event.event_type
        ):
            return False
        # Default calendar entity omits the special types but includes all the others
@@ -247,7 +247,7 @@ class LocationSubentryFlowHandler(ConfigSubentryFlow):
        user_input: dict[str, Any] | None = None,
    ) -> SubentryFlowResult:
        """Handle the location step."""
-        if self._get_entry().state is not ConfigEntryState.LOADED:
+        if self._get_entry().state != ConfigEntryState.LOADED:
            return self.async_abort(reason="entry_not_loaded")

        errors: dict[str, str] = {}
@@ -225,7 +225,7 @@ class LLMSubentryFlowHandler(ConfigSubentryFlow):
    ) -> SubentryFlowResult:
        """Set conversation options."""
        # abort if entry is not loaded
-        if self._get_entry().state is not ConfigEntryState.LOADED:
+        if self._get_entry().state != ConfigEntryState.LOADED:
            return self.async_abort(reason="entry_not_loaded")

        errors: dict[str, str] = {}
@@ -754,7 +754,7 @@ async def async_prepare_files_for_prompt(
                config={"http_options": {"timeout": TIMEOUT_MILLIS}},
            )

-        if uploaded_file.state is FileState.FAILED:
+        if uploaded_file.state == FileState.FAILED:
            raise HomeAssistantError(
                f"File `{uploaded_file.name}` processing"
                " failed, reason:"
@@ -766,7 +766,7 @@ async def async_prepare_files_for_prompt(
    tasks = [
        asyncio.create_task(wait_for_file_processing(part))
        for part in prompt_parts
-        if part.state is not FileState.ACTIVE
+        if part.state != FileState.ACTIVE
    ]
    async with asyncio.timeout(TIMEOUT_MILLIS / 1000):
        await asyncio.gather(*tasks)
@@ -237,7 +237,7 @@ class LocationSubentryFlowHandler(ConfigSubentryFlow):
        user_input: dict[str, Any] | None = None,
    ) -> SubentryFlowResult:
        """Handle the location step."""
-        if self._get_entry().state is not ConfigEntryState.LOADED:
+        if self._get_entry().state != ConfigEntryState.LOADED:
            return self.async_abort(reason="entry_not_loaded")

        errors: dict[str, str] = {}
@@ -26,7 +26,7 @@ def _get_coordinators(
    coordinators: dict[str, GrowattCoordinator] = {}

    for entry in hass.config_entries.async_entries(DOMAIN):
-        if entry.state is not ConfigEntryState.LOADED:
+        if entry.state != ConfigEntryState.LOADED:
            continue

        for coord in entry.runtime_data.devices.values():
@@ -806,10 +806,10 @@ async def _create_or_update_task(call: ServiceCall) -> ServiceResponse:  # noqa:
            data["daysOfMonth"] = [start_date.day]
            data["weeksOfMonth"] = []

-    if (interval := call.data.get(ATTR_INTERVAL)) is not None:
+    if interval := call.data.get(ATTR_INTERVAL):
        data["everyX"] = interval

-    if (streak := call.data.get(ATTR_STREAK)) is not None:
+    if streak := call.data.get(ATTR_STREAK):
        data["streak"] = streak

    try:
@@ -8,7 +8,7 @@ import os
 import struct
 from typing import Any

-from aiohasupervisor import SupervisorError
+from aiohasupervisor import SupervisorBadRequestError, SupervisorError
 from aiohasupervisor.models import (
    GreenOptions,
    HomeAssistantOptions,
@@ -25,6 +25,7 @@ from homeassistant.components.http import (
    CONF_SERVER_PORT,
    CONF_SSL_CERTIFICATE,
 )
+from homeassistant.components.onboarding import async_is_onboarded
 from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
 from homeassistant.const import (
    EVENT_CORE_CONFIG_UPDATE,
@@ -301,6 +302,28 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
            translation_key="supervisor_not_connected",
        ) from err

+    # During onboarding, Supervisor may be out of date. Attempt an update now
+    # so that core loads against an up-to-date Supervisor. A
+    # SupervisorBadRequestError means there is no update available, proceed
+    # normally. No exception means an update was triggered and we must wait for
+    # it to complete. Any other SupervisorError means something unexpected went
+    # wrong and we cannot proceed right now.
+    if not async_is_onboarded(hass):
+        try:
+            await supervisor_client.supervisor.update()
+        except SupervisorBadRequestError:
+            pass  # No update available, proceed normally.
+        except SupervisorError as err:
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="supervisor_not_connected",
+            ) from err
+        else:
+            raise ConfigEntryNotReady(
+                translation_domain=DOMAIN,
+                translation_key="supervisor_update_pending",
+            )
+
    # Get or create a refresh token for the Supervisor user
    user = hass.data[DATA_HASSIO_SUPERVISOR_USER]
    if user.refresh_tokens:
@@ -55,6 +55,9 @@
    },
    "supervisor_not_connected": {
      "message": "Not connected with the supervisor / system too busy"
+    },
+    "supervisor_update_pending": {
+      "message": "Supervisor update in progress, will retry when complete"
    }
  },
  "issues": {
@@ -247,7 +247,7 @@ class SupervisorOSUpdateEntity(HassioOSEntity, UpdateEntity):
    def release_url(self) -> str | None:
        """URL to the full release notes of the latest version available."""
        version = AwesomeVersion(self.latest_version)
-        if version.dev or version.strategy is AwesomeVersionStrategy.UNKNOWN:
+        if version.dev or version.strategy == AwesomeVersionStrategy.UNKNOWN:
            return "https://github.com/home-assistant/operating-system/commits/dev"
        return (
            f"https://github.com/home-assistant/operating-system/releases/tag/{version}"
@@ -304,7 +304,7 @@ class SupervisorSupervisorUpdateEntity(HassioSupervisorEntity, UpdateEntity):
    def release_url(self) -> str | None:
        """URL to the full release notes of the latest version available."""
        version = AwesomeVersion(self.latest_version)
-        if version.dev or version.strategy is AwesomeVersionStrategy.UNKNOWN:
+        if version.dev or version.strategy == AwesomeVersionStrategy.UNKNOWN:
            return "https://github.com/home-assistant/supervisor/commits/main"
        return f"https://github.com/home-assistant/supervisor/releases/tag/{version}"

@@ -150,7 +150,7 @@ def _get_controller(hass: HomeAssistant) -> Heos:
        hass.config_entries.async_entry_for_domain_unique_id(DOMAIN, DOMAIN)
    )

-    if not entry or entry.state is not ConfigEntryState.LOADED:
+    if not entry or not entry.state == ConfigEntryState.LOADED:
        raise HomeAssistantError(
            translation_domain=DOMAIN, translation_key="integration_not_loaded"
        )
@@ -266,12 +266,14 @@ class HomeConnectAirConditioningEntity(HomeConnectEntity, ClimateEntity):
                value=BSH_POWER_ON,
            )
        except HomeConnectError as err:
+            # pylint: disable-next=home-assistant-exception-placeholder-mismatch
            raise HomeAssistantError(
                translation_domain=DOMAIN,
                translation_key="power_on",
                translation_placeholders={
                    **get_dict_from_home_connect_error(err),
                    "appliance_name": self.appliance.info.name,
+                    "value": BSH_POWER_ON,
                },
            ) from err

@@ -418,10 +418,10 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
        otbr_manager = get_otbr_addon_manager(self.hass)
        addon_info = await self._async_get_addon_info(otbr_manager)

-        if addon_info.state is AddonState.NOT_INSTALLED:
+        if addon_info.state == AddonState.NOT_INSTALLED:
            return await self.async_step_install_otbr_addon()

-        if addon_info.state is AddonState.RUNNING:
+        if addon_info.state == AddonState.RUNNING:
            await otbr_manager.async_stop_addon()

        return await self.async_step_start_otbr_addon()
@@ -111,7 +111,7 @@ class WaitingAddonManager(AddonManager):
            info = None

        # Do not try to uninstall an addon if it is already uninstalled
-        if info is not None and info.state is AddonState.NOT_INSTALLED:
+        if info is not None and info.state == AddonState.NOT_INSTALLED:
            return

        await self.async_uninstall_addon()
@@ -383,7 +383,7 @@ class OptionsFlowHandler(OptionsFlow, ABC):
        multipan_manager = await get_multiprotocol_addon_manager(self.hass)
        addon_info = await self._async_get_addon_info(multipan_manager)

-        if addon_info.state is AddonState.NOT_INSTALLED:
+        if addon_info.state == AddonState.NOT_INSTALLED:
            return await self.async_step_addon_not_installed()
        return await self.async_step_addon_installed()

@@ -691,10 +691,10 @@ class OptionsFlowHandler(OptionsFlow, ABC):
        flasher_manager = get_flasher_addon_manager(self.hass)
        addon_info = await self._async_get_addon_info(flasher_manager)

-        if addon_info.state is AddonState.NOT_INSTALLED:
+        if addon_info.state == AddonState.NOT_INSTALLED:
            return await self.async_step_install_flasher_addon()

-        if addon_info.state is AddonState.NOT_RUNNING:
+        if addon_info.state == AddonState.NOT_RUNNING:
            return await self.async_step_configure_flasher_addon()

        # If the addon is already installed and running, fail
@@ -907,7 +907,7 @@ async def check_multi_pan_addon(hass: HomeAssistant) -> None:
    # Request the addon to start if it's not started
    # `async_start_addon` returns as soon as the start request has been sent
    # and does not wait for the addon to be started, so we raise below
-    if addon_info.state is AddonState.NOT_RUNNING:
+    if addon_info.state == AddonState.NOT_RUNNING:
        await multipan_manager.async_start_addon()

    if addon_info.state not in (AddonState.NOT_INSTALLED, AddonState.RUNNING):
@@ -927,7 +927,7 @@ async def multi_pan_addon_using_device(hass: HomeAssistant, device_path: str) ->
    multipan_manager = await get_multiprotocol_addon_manager(hass)
    addon_info: AddonInfo = await multipan_manager.async_get_addon_info()

-    if addon_info.state is not AddonState.RUNNING:
+    if addon_info.state != AddonState.RUNNING:
        return False

    if addon_info.options["device"] != device_path:
@@ -124,7 +124,7 @@ class OwningAddon:
        except AddonError:
            return False
        else:
-            return addon_info.state is AddonState.RUNNING
+            return addon_info.state == AddonState.RUNNING

    @asynccontextmanager
    async def temporarily_stop(self, hass: HomeAssistant) -> AsyncGenerator[None]:
@@ -137,7 +137,7 @@ class OwningAddon:
            yield
            return

-        if addon_info.state is not AddonState.RUNNING:
+        if addon_info.state != AddonState.RUNNING:
            yield
            return

@@ -173,7 +173,7 @@ class OwningIntegration:
            yield
            return

-        if entry.state is not ConfigEntryState.LOADED:
+        if entry.state != ConfigEntryState.LOADED:
            yield
            return

@@ -213,7 +213,7 @@ async def get_otbr_addon_firmware_info(
    except AddonError:
        return None

-    if otbr_addon_info.state is AddonState.NOT_INSTALLED:
+    if otbr_addon_info.state == AddonState.NOT_INSTALLED:
        return None

    if (otbr_path := otbr_addon_info.options.get("device")) is None:
@@ -238,7 +238,7 @@ async def get_z2m_addon_firmware_info(
    except AddonError:
        return None

-    if z2m_addon_info.state is AddonState.NOT_INSTALLED:
+    if z2m_addon_info.state == AddonState.NOT_INSTALLED:
        return None

    serial = z2m_addon_info.options.get("serial")
@@ -286,7 +286,7 @@ async def guess_hardware_owners(
    except AddonError:
        pass
    else:
-        if multipan_addon_info.state is not AddonState.NOT_INSTALLED:
+        if multipan_addon_info.state != AddonState.NOT_INSTALLED:
            multipan_path = multipan_addon_info.options.get("device")

            if multipan_path is not None:
@@ -122,7 +122,7 @@ class HomeeConfigFlow(ConfigFlow, domain=DOMAIN):
        existing_entry = await self.async_set_unique_id(self._name)
        if (
            existing_entry
-            and existing_entry.state is ConfigEntryState.LOADED
+            and existing_entry.state == ConfigEntryState.LOADED
            and existing_entry.runtime_data.connected
            and existing_entry.data[CONF_HOST] != self._host
        ):
@@ -298,7 +298,7 @@ class HKDevice:
        # yet.
        attempts = None if self.hass.state is CoreState.running else 1
        if (
-            transport is Transport.BLE
+            transport == Transport.BLE
            and pairing.accessories
            and pairing.accessories.has_aid(1)
        ):
@@ -328,7 +328,7 @@ class HKDevice:
        )
        entry.async_on_unload(self._async_cancel_subscription_timer)

-        if transport is not Transport.BLE:
+        if transport != Transport.BLE:
            # Although async_populate_accessories_state fetched the accessory database,
            # the /accessories endpoint may return cached values from the accessory's
            # perspective. For example, Ecobee thermostats may report stale temperature
@@ -349,7 +349,7 @@ class HKDevice:

        await self.async_process_entity_map()

-        if transport is not Transport.BLE:
+        if transport != Transport.BLE:
            # Start regular polling after entity map is processed
            self._async_start_polling()

@@ -359,7 +359,7 @@ class HKDevice:

        self.async_set_available_state(self.pairing.is_available)

-        if transport is Transport.BLE:
+        if transport == Transport.BLE:
            # If we are using BLE, we need to periodically check of the
            # BLE device is available since we won't get callbacks
            # when it goes away since we HomeKit supports disconnected
@@ -420,7 +420,7 @@ class HKDevice:
            identifiers.add((IDENTIFIER_SERIAL_NUMBER, accessory.serial_number))

        connections: set[tuple[str, str]] = set()
-        if self.pairing.transport is Transport.BLE and (
+        if self.pairing.transport == Transport.BLE and (
            discovery := self.pairing.controller.discoveries.get(
                normalize_hkid(self.unique_id)
            )
@@ -622,7 +622,7 @@ class HKDevice:
                current_unique_id.add((accessory.aid, service.iid, None))

                for char in service.characteristics:
-                    if self.pairing.transport is not Transport.BLE:
+                    if self.pairing.transport != Transport.BLE:
                        if char.type == CharacteristicsTypes.THREAD_CONTROL_POINT:
                            continue

@@ -1057,7 +1057,7 @@ class HKDevice:
    @property
    def is_unprovisioned_thread_device(self) -> bool:
        """Is this a thread capable device not connected by CoAP."""
-        if self.pairing.controller.transport_type is not TransportType.BLE:
+        if self.pairing.controller.transport_type != TransportType.BLE:
            return False

        if not self.entity_map.aid(1).services.first(
@@ -1069,7 +1069,7 @@ class HKDevice:

    async def async_thread_provision(self) -> None:
        """Migrate a HomeKit pairing to CoAP (Thread)."""
-        if self.pairing.controller.transport_type is TransportType.COAP:
+        if self.pairing.controller.transport_type == TransportType.COAP:
            raise HomeAssistantError("Already connected to a thread network")

        if not (dataset := await async_get_preferred_dataset(self.hass)):
@@ -700,7 +700,7 @@ async def async_setup_entry(

    @callback
    def async_add_accessory(accessory: Accessory) -> bool:
-        if conn.pairing.transport is not Transport.BLE:
+        if conn.pairing.transport != Transport.BLE:
            return False

        accessory_info = accessory.services.first(
@@ -180,24 +180,27 @@ async def async_setup_entry(
 class HomematicipCloudConnectionSensor(HomematicipGenericEntity, BinarySensorEntity):
    """Representation of the HomematicIP cloud connection sensor."""

-    _attr_translation_key = "cloud_connection"
-
    def __init__(self, hap: HomematicipHAP) -> None:
        """Initialize the cloud connection sensor."""
        super().__init__(hap, hap.home, feature_id="cloud_connection")

+    @property
+    def name(self) -> str:
+        """Return the name cloud connection entity."""
+
+        name = "Cloud Connection"
+        # Add a prefix to the name if the homematic ip home has a name.
+        return name if not self._home.name else f"{self._home.name} {name}"
+
    @property
    def device_info(self) -> DeviceInfo:
        """Return device specific attributes."""
-        # Merges into the existing HAP device registered in __init__.py.
-        # Name must match __init__.py logic for has_entity_name to work.
-        label = self._home.label or ""
+        # Adds a sensor to the existing HAP device
        return DeviceInfo(
            identifiers={
                # Serial numbers of Homematic IP device
                (DOMAIN, self._home.id)
-            },
-            name=label,
+            }
        )

    @property
@@ -576,7 +579,6 @@ class HomematicipPluggableMainsFailureSurveillanceSensor(
 class HomematicipSecurityZoneSensorGroup(HomematicipGenericEntity, BinarySensorEntity):
    """Representation of the HomematicIP security zone sensor group."""

-    _attr_has_entity_name = False
    _attr_device_class = BinarySensorDeviceClass.SAFETY

    def __init__(
@@ -74,7 +74,6 @@ class HomematicipHeatingGroup(HomematicipGenericEntity, ClimateEntity):
    basically enabled in the hmip app.
    """

-    _attr_has_entity_name = False
    _attr_supported_features = (
        ClimateEntityFeature.PRESET_MODE | ClimateEntityFeature.TARGET_TEMPERATURE
    )
@@ -320,7 +320,6 @@ class HomematicipGarageDoorModule(HomematicipGenericEntity, CoverEntity):
 class HomematicipCoverShutterGroup(HomematicipGenericEntity, CoverEntity):
    """Representation of the HomematicIP cover shutter group."""

-    _attr_has_entity_name = False
    _attr_device_class = CoverDeviceClass.SHUTTER

    def __init__(self, hap: HomematicipHAP, device, post: str = "ShutterGroup") -> None:
@@ -74,7 +74,6 @@ GROUP_ATTRIBUTES = {
 class HomematicipGenericEntity(Entity):
    """Representation of the HomematicIP generic entity."""

-    _attr_has_entity_name = True
    _attr_should_poll = False

    def __init__(
@@ -113,14 +112,6 @@ class HomematicipGenericEntity(Entity):
        # Marker showing that the HmIP device hase been removed.
        self.hmip_device_removed = False

-        # Compute entity name based on has_entity_name mode.
-        if not self._attr_has_entity_name:
-            # Legacy mode (groups, special entities): compose the full name
-            # including device/group label and home prefix.
-            self._attr_name = self._compute_legacy_name()
-        else:
-            self._setup_entity_name()
-
    @property
    def device_info(self) -> DeviceInfo | None:
        """Return device specific attributes."""
@@ -129,14 +120,6 @@ class HomematicipGenericEntity(Entity):
            device_id = str(self._device.id)
            home_id = str(self._device.homeId)

-            # Include the home name in the device name so that the
-            # previous "{home} {device}" naming is preserved after
-            # switching to has_entity_name=True.
-            device_name = self._device.label
-            home_name = getattr(self._home, "name", None)
-            if device_name and home_name:
-                device_name = f"{home_name} {device_name}"
-
            return DeviceInfo(
                identifiers={
                    # Serial numbers of Homematic IP device
@@ -144,7 +127,7 @@ class HomematicipGenericEntity(Entity):
                },
                manufacturer=self._device.oem,
                model=self._device.modelType,
-                name=device_name,
+                name=self._device.label,
                sw_version=self._device.firmwareVersion,
                # Link to the homematic ip access point.
                via_device=(DOMAIN, home_id),
@@ -217,93 +200,38 @@ class HomematicipGenericEntity(Entity):
            self.async_remove(force_remove=True), eager_start=False
        )

-    def _compute_legacy_name(self) -> str:
-        """Compute the full legacy name for entities without has_entity_name.
+    @property
+    def name(self) -> str:
+        """Return the name of the generic entity."""

-        Used by group entities and other special cases where has_entity_name
-        is False. Includes device/group label, post suffix, and home prefix.
-        """
-        name = self._device.label or ""
-        if self._post:
-            name = f"{name} {self._post}" if name else self._post
+        name = ""
+        # Try to get a label from a channel.
+        functional_channels = getattr(self._device, "functionalChannels", None)
+        if functional_channels and self.functional_channel:
+            if self._is_multi_channel:
+                label = getattr(self.functional_channel, "label", None)
+                if label:
+                    name = str(label)
+            elif len(functional_channels) > 1:
+                label = getattr(functional_channels[1], "label", None)
+                if label:
+                    name = str(label)
+
+        # Use device label, if name is not defined by channel label.
+        if not name:
+            name = self._device.label or ""
+            if self._post:
+                name = f"{name} {self._post}"
+            elif self._is_multi_channel:
+                name = f"{name} Channel{self.get_channel_index()}"
+
+        # Add a prefix to the name if the homematic ip home has a name.
        home_name = getattr(self._home, "name", None)
        if name and home_name:
            name = f"{home_name} {name}"
+
        return name

-    def _setup_entity_name(self) -> None:
-        """Set up entity naming for has_entity_name mode.
-
-        With has_entity_name=True, HA composes the full friendly name as
-        "{device_name} {entity_name}". This method sets the appropriate
-        naming attributes.
-
-        For multi-channel entities, channel labels provide _attr_name (dynamic).
-        For entities with _post, _attr_name is derived from the post suffix,
-        with the first letter capitalized for display consistency.
-        For primary entities, HA uses device_class as the name.
-        """
-        # Multi-channel entities: use channel label as entity name.
-        if self._is_multi_channel and self.functional_channel:
-            label = getattr(self.functional_channel, "label", None)
-            if label:
-                label_str = str(label)
-                device_label = self._device.label or ""
-                # Strip device name prefix from channel label to avoid
-                # duplication when HA composes "{device_name} {entity_name}".
-                # E.g., device "Licht Flur" + channel "Licht Flur 5" -> "5".
-                if device_label and label_str.startswith(device_label):
-                    stripped = label_str[len(device_label) :].strip()
-                    if stripped:
-                        self._attr_name = stripped
-                    # Otherwise channel label equals device label (modulo
-                    # whitespace); leave _attr_name unset so HA composes just
-                    # the device name without duplicating it.
-                    return
-                self._attr_name = label_str
-                return
-            # Fallback: use post suffix or generic channel name.
-            if self._post:
-                self._attr_name = self._post[0].upper() + self._post[1:]
-            else:
-                self._attr_name = f"Channel{self.get_channel_index()}"
-            return
-
-        # Entities with a post suffix: use it as the entity name,
-        # capitalizing the first letter for display consistency.
-        if self._post:
-            self._attr_name = self._post[0].upper() + self._post[1:]
-            return
-
-        # Non-multi-channel entities on devices with multiple channels:
-        # use the first functional channel's label as name context.
-        # This preserves names like "Treppe CH" for single-function entities
-        # on multi-channel devices (e.g., HmIP-BSL switch channel).
-        functional_channels = getattr(self._device, "functionalChannels", None)
-        if functional_channels and len(functional_channels) > 1:
-            ch1 = (
-                functional_channels.get(1)
-                if isinstance(functional_channels, dict)
-                else functional_channels[1]
-            )
-            label = getattr(ch1, "label", None) if ch1 else None
-            if label:
-                label_str = str(label)
-                device_label = self._device.label or ""
-                # Strip device name prefix to avoid duplication.
-                if device_label and label_str.startswith(device_label):
-                    stripped = label_str[len(device_label) :].strip()
-                    if stripped:
-                        self._attr_name = stripped
-                    # Otherwise channel label equals device label (modulo
-                    # whitespace); leave _attr_name unset.
-                    return
-                self._attr_name = label_str
-                return
-
-        # Primary entity on device: leave unset so HA derives name from
-        # device_class or translation_key.
-
    @property
    def available(self) -> bool:
        """Return if entity is available."""
@@ -82,6 +82,7 @@ class HomematicipDoorBellEvent(HomematicipGenericEntity, EventEntity):
        super().__init__(
            hap,
            device,
+            post=description.key,
            channel=channel,
            is_multi_channel=False,
            feature_id="doorbell",
@@ -1070,7 +1070,9 @@ class HmipSmokeDetectorSensor(HomematicipGenericEntity, SensorEntity):
        description: HmipSmokeDetectorSensorDescription,
    ) -> None:
        """Initialize the smoke detector sensor."""
-        super().__init__(hap, device, feature_id="smoke_detector_sensor")
+        super().__init__(
+            hap, device, post=description.key, feature_id="smoke_detector_sensor"
+        )
        self.entity_description = description
        self._sensor_unique_id = f"{device.id}_{description.key}"

@@ -37,11 +37,6 @@
    }
  },
  "entity": {
-    "binary_sensor": {
-      "cloud_connection": {
-        "name": "Cloud connection"
-      }
-    },
    "light": {
      "optical_signal_light": {
        "state_attributes": {
@@ -142,8 +142,6 @@ class HomematicipSwitch(HomematicipMultiSwitch, SwitchEntity):
 class HomematicipGroupSwitch(HomematicipGenericEntity, SwitchEntity):
    """Representation of the HomematicIP switching group."""

-    _attr_has_entity_name = False
-
    def __init__(self, hap: HomematicipHAP, device, post: str = "Group") -> None:
        """Initialize switching group."""
        device.modelType = f"HmIP-{post}"
@@ -74,6 +74,11 @@ class HomematicipWeatherSensor(HomematicipGenericEntity, WeatherEntity):
        """Initialize the weather sensor."""
        super().__init__(hap, device, feature_id="weather")

+    @property
+    def name(self) -> str:
+        """Return the name of the sensor."""
+        return self._device.label
+
    @property
    def native_temperature(self) -> float:
        """Return the platform temperature."""
@@ -113,7 +118,6 @@ class HomematicipWeatherSensorPro(HomematicipWeatherSensor):
 class HomematicipHomeWeather(HomematicipGenericEntity, WeatherEntity):
    """Representation of the HomematicIP home weather."""

-    _attr_has_entity_name = False
    _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
    _attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
    _attr_attribution = "Powered by Homematic IP"
@@ -16,7 +16,6 @@ import voluptuous as vol

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONF_COMMAND,
    CONF_HOST,
    CONF_ID,
    CONF_NAME,
@@ -40,6 +39,9 @@ _LOGGER = logging.getLogger(__name__)

 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.LIGHT]

+# pylint: disable-next=home-assistant-duplicate-const
+CONF_COMMAND = "command"
+
 EVENT_BUTTON_PRESS = "homeworks_button_press"
 EVENT_BUTTON_RELEASE = "homeworks_button_release"

--- a/Show More
+++ b/Show More