Fix ZeroconfServiceInfo for upcoming HA-core and attempt at fixing building for HA dev branch

Author: CoMPaTech

.github/workflows/test.yml

@@ -58,14 +58,22 @@ jobs:
           SKIP: local-test-core-prep,local-test-pip-prep,local-testing,local-quality
 
   # Prepare default python version environment
-  ha-core-prepare:
+  ha-core-release:
     runs-on: ubuntu-latest
-    name: Setup for HA-core (release)
+    name: Setup for HA-core (release/master)
     needs:
       - pre-commit
     steps:
       - name: Check out committed code
         uses: actions/[email protected]
+      - name: Determine Branch Test Mode
+        id: determine_mode
+        run: |
+          if [[ "${{ contains(github.event.pull_request.labels.*.name, 'require-dev-pass') }}" == "true" ]]; then
+            echo "STRICT_DEV=true" >> $GITHUB_ENV
+          else
+            echo "STRICT_DEV=false" >> $GITHUB_ENV
+          fi
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/[email protected]
@@ -75,7 +83,7 @@ jobs:
         id: cache-hacore
         uses: actions/[email protected]
         env:
-          cache-name: cache-hacore
+          cache-name: cache-hacore-release
         with:
           path: ./
           key: >-
@@ -89,8 +97,52 @@ jobs:
             ${{ env.CACHE_VERSION}}-${{ runner.os }}
             ${{ env.CACHE_VERSION}}
       - name: Test through HA-core (master/release)
+        continue-on-error: ${{ env.STRICT_DEV == 'true' }} # Allow master failures only if dev is strict
+        run: |
+          GITHUB_ACTIONS="" scripts/core-testing.sh
+
+  ha-core-dev:
+    runs-on: ubuntu-latest
+    name: Setup for HA-core (dev)
+    needs:
+      - pre-commit
+    steps:
+      - name: Check out committed code
+        uses: actions/[email protected]
+      - name: Determine Branch Test Mode
+        id: determine_mode
+        run: |
+          if [[ "${{ contains(github.event.pull_request.labels.*.name, 'require-dev-pass') }}" == "true" ]]; then
+            echo "STRICT_DEV=true" >> $GITHUB_ENV
+          else
+            echo "STRICT_DEV=false" >> $GITHUB_ENV
+          fi
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/[email protected]
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore base HA-core Python ${{ env.DEFAULT_PYTHON }} environment
+        id: cache-hacore
+        uses: actions/[email protected]
+        env:
+          cache-name: cache-hacore-dev
+        with:
+          path: ./
+          key: >-
+            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-hacore-${{
+            steps.python.outputs.python-version }}-${{
+            hashFiles('./custom_components/plugwise/manifest.json') }}-${{
+            hashFiles('./ha-core/.git/plugwise-tracking') }}
+          restore-keys: |
+            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-hacore-${{ steps.python.outputs.python-version }}-
+            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-hacore
+            ${{ env.CACHE_VERSION}}-${{ runner.os }}
+            ${{ env.CACHE_VERSION}}
+      - name: Test through HA-core (dev)
+        continue-on-error: ${{ env.STRICT_DEV == 'false' }} # Allow dev failures unless strict
         run: |
-          GITHUB_ACTIONS="" BRANCH="master" scripts/core-testing.sh
+          GITHUB_ACTIONS="" BRANCH="dev" scripts/core-testing.sh
 
   shellcheck:
     name: Shellcheck

.gitignore

@@ -8,3 +8,4 @@ venv
 *.orig
 node_modules
 manual_clone_ha
+package-lock.json

.pre-commit-config.yaml

@@ -75,30 +75,30 @@ repos:
     hooks:
       - id: local-test-core-prep
         # yamllint disable-line rule:line-length
-        name: "Home Assistant Core Testing - Cloning/updating HA core#master - patience!"
+        name: "Home Assistant Core Testing - Cloning/updating HA core - patience!"
         # yamllint disable-line rule:line-length
-        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" scripts/core-testing.sh core_prep'
+        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" BRANCH="${BRANCH:-}" scripts/core-testing.sh core_prep'
         language: script
         pass_filenames: false
       - id: local-test-pip-prep
         # yamllint disable-line rule:line-length
         name: "Home Assistant Core Testing - Installing dependencies - patience!"
         # yamllint disable-line rule:line-length
-        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" scripts/core-testing.sh pip_prep'
+        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" BRANCH="${BRANCH:-}" scripts/core-testing.sh pip_prep'
         language: script
         pass_filenames: false
       - id: local-testing
         # yamllint disable-line rule:line-length
         name: "Home Assistant Core Testing - Performing Tests"
         # yamllint disable-line rule:line-length
-        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" scripts/core-testing.sh testing'
+        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" BRANCH="${BRANCH:-}" scripts/core-testing.sh testing'
         language: script
         pass_filenames: false
       - id: local-quality
         # yamllint disable-line rule:line-length
         name: "Home Assistant Core Testing - Quality checks - might need patience"
         # yamllint disable-line rule:line-length
-        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" scripts/core-testing.sh quality'
+        entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" BRANCH="${BRANCH:-}" scripts/core-testing.sh quality'
         language: script
         pass_filenames: false
   - repo: https://github.com/igorshubovych/markdownlint-cli

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Versions from 0.40 and up
 
+## v0.56.1 / ONGOING
+
+- Config_flow: follow [Core PR](https://github.com/home-assistant/core/pull/135653) movement of ZeroconfServiceInfo
+
 ## v0.56.0
 
 - Internal: Fixes for the CI process

custom_components/plugwise/config_flow.py

@@ -17,7 +17,6 @@
 )
 import voluptuous as vol
 
-from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.config_entries import (
     SOURCE_USER,
     ConfigEntry,
@@ -42,6 +41,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import (
     ANNA_WITH_ADAM,

custom_components/plugwise/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "local_polling",
   "loggers": ["plugwise"],
   "requirements": ["plugwise==1.7.0"],
-  "version": "0.56.0",
+  "version": "0.56.1a0",
   "zeroconf": ["_plugwise._tcp.local."]
 }

hacs.json

@@ -9,6 +9,6 @@
     "sensor",
     "switch"
   ],
-  "homeassistant": "2024.12.0b2",
+  "homeassistant": "2025.2.0",
   "render_readme": true
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plugwise-beta"
-version = "0.55.4"
+version = "0.56.1a0"
 description = "Plugwise beta custom-component"
 readme = "README.md"
 requires-python = ">=3.12"

tests/components/plugwise/test_config_flow.py

@@ -19,7 +19,6 @@
     DEFAULT_PORT,
     DOMAIN,
 )
-from homeassistant.components.zeroconf import ZeroconfServiceInfo
 from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF, ConfigFlowResult
 from homeassistant.const import (
     CONF_HOST,
@@ -33,6 +32,7 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from packaging.version import Version
 
 from tests.common import MockConfigEntry