Bump plugwise to v0.47.8 and adapt

.github/workflows/hassfest.yaml

@@ -10,5 +10,5 @@ jobs:
   hassfest_custom:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v6.0.2"
-      - uses: home-assistant/actions/hassfest@master
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
+      - uses: home-assistant/actions/hassfest@f4ca6f671bd429efb108c0f2fa0ae8af0215986c

.github/workflows/test.yml

@@ -4,7 +4,7 @@
 name: Test against HA-core
 
 env:
-  CACHE_VERSION: 2
+  CACHE_VERSION: 5
   DEFAULT_PYTHON: "3.14"
   VENV: venv
 
@@ -34,15 +34,15 @@ jobs:
       python-version: ${{ steps.python.outputs.python-version }}
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v6
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Fetch HA pyproject
         id: core-version
-        run: wget -O ha_pyproject.toml "https://raw.githubusercontent.com/home-assistant/core/refs/heads/dev/pyproject.toml"
+        run: curl --fail --location --proto '=https' -o ha_pyproject.toml "https://raw.githubusercontent.com/home-assistant/core/refs/heads/dev/pyproject.toml"
       - name: Compute cache key
         id: set-key
         run: echo "cache-key=${{ runner.os }}--${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml', 'requirements_test.txt', '.pre-commit-config.yaml', 'ha_pyproject.toml') }}" >> "$GITHUB_OUTPUT"
@@ -55,15 +55,14 @@ jobs:
     steps:
       - name: Prepare code checkout and python/prek/pre-commit setup
         id: cache-reuse
-        uses: plugwise/gh-actions/prepare-python-and-code@v2
+        uses: plugwise/gh-actions/prepare-python-and-code@6b33ca47b5b47b3324e081221da2baa499905914
         with:
           cache-key: ${{ needs.cache.outputs.cache-key }}
           fail-on-miss: false  # First time create cache (if not already exists)
           python-version: ${{ needs.cache.outputs.python-version }}
           venv-dir: ${{ env.VENV }}
           clone-core: "true"
 
-  # Prepare default python version environment
   ha-core-release:
     runs-on: ubuntu-latest
     name: Setup for HA-core (release/master)
@@ -72,15 +71,15 @@ jobs:
       - prepare
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v6
-      - name: Restore cached environment
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
+      - name: Prepare code checkout and python/prek/pre-commit setup
         id: cache-reuse
-        uses: plugwise/gh-actions/restore-venv@v2
+        uses: plugwise/gh-actions/prepare-python-and-code@6b33ca47b5b47b3324e081221da2baa499905914
         with:
           cache-key: ${{ needs.cache.outputs.cache-key }}
+          fail-on-miss: false  # First time create cache (if not already exists)
           python-version: ${{ needs.cache.outputs.python-version }}
           venv-dir: ${{ env.VENV }}
-          precommit-home: ${{ env.PRE_COMMIT_HOME }}
       - name: Test through HA-core (master/release)
         id: ha_core_release_tests
         run: |
@@ -94,6 +93,6 @@ jobs:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
       - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
+        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ default_language_version:
 repos:
   # Run manually in CI skipping the branch checks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.14
+    rev: v0.16.6
     hooks:
       - id: ruff
         name: "Ruff-ing code"
@@ -27,7 +27,7 @@ repos:
         name: "Checking pyupgrade"
         args: [--py39-plus]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.2
+    rev: v2.4.3
     hooks:
       - id: codespell
         name: "Verifying/updating code for spelling issues"
@@ -52,7 +52,7 @@ repos:
       - id: yamllint
         name: "Linting yaml"
   - repo: https://github.com/biomejs/pre-commit
-    rev: v2.4.15
+    rev: v2.5.12
     hooks:
       - id: biome-lint
         additional_dependencies: ["@biomejs/biome@2.0.4"]
@@ -79,7 +79,7 @@ repos:
         language: script
         pass_filenames: false
   - repo: https://github.com/jackdewinter/pymarkdown
-    rev: v0.9.37
+    rev: v0.9.39
     hooks:
       - id: pymarkdown
         name: "MarkDown Lint"

CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## Ongoing
+## v0.59.3
 
+- General environment and code updates, improve (test)files structure
 - Bump python to 3.14
+- Link to plugwise_usb [v0.47.8](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.47.8), rework to using the HA USB platform
 
 ## v0.59.2
 

custom_components/plugwise_usb/binary_sensor.py

@@ -1,7 +1,5 @@
 """Plugwise USB Binary Sensor component for Home Assistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

custom_components/plugwise_usb/button.py

@@ -1,7 +1,5 @@
 """Plugwise USB Button component for HomeAssistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

custom_components/plugwise_usb/config_flow.py

@@ -1,7 +1,5 @@
 """Config flow for Plugwise USB integration."""
 
-from __future__ import annotations
-
 from typing import Any
 
 from plugwise_usb import Stick
@@ -13,7 +11,6 @@
 from homeassistant.const import CONF_BASE
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
-import serial.tools.list_ports
 
 from .const import CONF_MANUAL_PATH, CONF_USB_PATH, DOMAIN, MANUAL_PATH
 
@@ -72,11 +69,15 @@ async def async_step_user(
     ) -> FlowResult:
         """Step when user initializes a integration."""
         errors: dict[str, str] = {}
-        ports = await self.hass.async_add_executor_job(serial.tools.list_ports.comports)
+        ports = [
+            port
+            for port in await usb.async_scan_serial_ports(self.hass)
+            if isinstance(port, usb.USBDevice)
+        ]
         list_of_ports = [
-            f"{p}, s/n: {p.serial_number or 'n/a'}"
-            + (f" - {p.manufacturer}" if p.manufacturer else "")
-            for p in ports
+            f"{port.device}, s/n: {port.serial_number or 'n/a'}"
+            + (f" - {port.manufacturer}" if port.manufacturer else "")
+            for port in ports
         ]
         list_of_ports.append(CONF_MANUAL_PATH)
 
@@ -87,9 +88,7 @@ async def async_step_user(
                 return await self.async_step_manual_path()
 
             port = ports[list_of_ports.index(user_selection)]
-            device_path = await self.hass.async_add_executor_job(
-                usb.get_serial_by_id, port.device
-            )
+            device_path = port.device
             errors, mac_stick = await validate_usb_connection(self.hass, device_path)
             if not errors:
                 await self.async_set_unique_id(

custom_components/plugwise_usb/coordinator.py

@@ -54,6 +54,7 @@ def __init__(
             super().__init__(
                 hass,
                 _LOGGER,
+                config_entry=config_entry,
                 name=node.node_info.name,
                 update_interval=timedelta(seconds=15),
                 update_method=self.async_node_update,

custom_components/plugwise_usb/entity.py

@@ -1,13 +1,15 @@
 """Plugwise USB stick base entity."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 import logging
 
 from plugwise_usb.api import NodeFeature, NodeInfo
 
-from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE, DeviceInfo
+from homeassistant.helpers.device_registry import (
+    CONNECTION_ZIGBEE,
+    DeviceInfo,
+    async_get_device_id_by_identifier,
+)
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -38,9 +40,9 @@ def __init__(
         super().__init__(node_duc, context=entity_description.node_feature)
         self.node_duc = node_duc
         self.entity_description = entity_description
+        self.entry = node_duc.config_entry
         self._node_info: NodeInfo = node_duc.node.node_info
         self._attr_unique_id = f"{self._node_info.mac}-{entity_description.key}"
-        self._via_device = (DOMAIN, str(node_duc.api_stick.mac_stick))
 
     @property
     def available(self) -> bool:
@@ -61,7 +63,11 @@ def device_info(self) -> DeviceInfo:
             model_id=self._node_info.model_type,
             name=str(self._node_info.name),
             sw_version=str(self._node_info.firmware),
-            via_device=self._via_device,
+            via_device_id=async_get_device_id_by_identifier(
+                self.node_duc.hass,
+                (DOMAIN, str(self.node_duc.api_stick.mac_stick)),
+                config_entry_id=self.entry.entry_id,
+            ),
         )
 
     async def async_added_to_hass(self):

custom_components/plugwise_usb/event.py

@@ -1,7 +1,5 @@
 """Plugwise USB Event component for HomeAssistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

custom_components/plugwise_usb/manifest.json

@@ -9,6 +9,6 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/plugwise/python-plugwise-usb/issues",
   "loggers": ["plugwise_usb"],
-  "requirements": ["plugwise-usb==0.47.6"],
-  "version": "0.59.2"
+  "requirements": ["plugwise-usb==0.47.8"],
+  "version": "0.59.3"
 }

custom_components/plugwise_usb/number.py

@@ -1,7 +1,5 @@
 """Plugwise USB Number component for HomeAssistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

custom_components/plugwise_usb/select.py

@@ -1,7 +1,5 @@
 """Plugwise USB Select component for HomeAssistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 from enum import Enum

custom_components/plugwise_usb/sensor.py

@@ -1,7 +1,5 @@
 """Plugwise USB Sensor component for Home Assistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

custom_components/plugwise_usb/switch.py

@@ -1,7 +1,5 @@
 """Plugwise USB Switch component for HomeAssistant."""
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 from datetime import timedelta
 import logging

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plugwise_usb-beta"
-version = "0.59.2"
+version = "0.59.3"
 description = "Plugwise USB custom_component (BETA)"
 readme = "README.md"
 requires-python = ">=3.14"