Merge pull request #266 from plugwise/cifix3

Revert custom component testing in favor for (also) testing against dev

Author: CoMPaTech

.github/workflows/test.yml

@@ -1,41 +1,94 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test against HA-core using pytest-homeassistant-custom-component
+name: Test against HA-core
 
 env:
-  CACHE_VERSION: 10
+  CACHE_VERSION: 11
   DEFAULT_PYTHON: "3.13"
+  PRE_COMMIT_HOME: ~/.cache/pre-commit
+  VENV: venv
+
+# Do not run on 'push' (as the flow doesn't have access to the labels) - also disabled workflow_dispatch as such
+# Workaround could be something like
+#      - name: Get PR labels
+#        run: |
+#          PR_LABELS=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+#          "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels")
+#          echo "PR Labels: $PR_LABELS"
 
 on:
-  workflow_dispatch:
-  push:
-  schedule:
-    - cron: "0 0 * * 0"
-# pull_request:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+      - unlabeled
 
 jobs:
-  # Prepare default python version environment
-  ha-core-prepare:
+  # Determine cache key once
+  cache:
     runs-on: ubuntu-latest
-    name: Setup for HA-core
+    name: Cache identify
+    outputs:
+      cache-key: ${{ steps.set-key.outputs.cache-key }}
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Prepare virtual env for testing
-        run: |
-          scripts/setup_test.sh
-      - name: Test
-        run: |
-          scripts/tests_and_coverage.sh test_and_coverage
-      - name: Quality
+      - 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"
+      - name: Compute cache key
+        id: set-key
+        run: echo "cache-key=${{ runner.os }}-venv-cache-${{ env.CACHE_VERSION }}-${{ steps.python.outputs.python-version }}-${{ hashFiles('pyproject.toml', 'requirements_test.txt', '.pre-commit-config.yaml', 'ha_pyproject.toml') }}" >> "$GITHUB_OUTPUT"
+
+  # Prepare default python version environment
+  prepare:
+    runs-on: ubuntu-latest
+    needs: cache
+    name: Prepare
+    steps:
+      - name: Prepare code checkout and python/pre-commit setup
+        id: cache-reuse
+        uses: plugwise/gh-actions/prepare-python-and-code@v1
+        with:
+          cache-key: ${{ needs.cache.outputs.cache-key }}
+          fail-on-miss: false  # First time create cache (if not already exists)
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          venv-dir: ${{ env.VENV }}
+          precommit-home: ${{ env.PRE_COMMIT_HOME }}
+          clone-core: "true"
+
+  # Prepare default python version environment
+  ha-core-release:
+    runs-on: ubuntu-latest
+    name: Setup for HA-core (release/master)
+    needs:
+      - cache
+      - prepare
+    steps:
+      - name: Check out committed code
+        uses: actions/checkout@v4
+      - name: Restore cached environment
+        id: cache-reuse
+        uses: plugwise/gh-actions/restore-venv@v1
+        with:
+          cache-key: ${{ needs.cache.outputs.cache-key }}
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          venv-dir: ${{ env.VENV }}
+          precommit-home: ${{ env.PRE_COMMIT_HOME }}
+      - name: Test through HA-core (master/release)
+        id: ha_core_release_tests
         run: |
-          scripts/tests_and_coverage.sh linting
+          set +e
+          GITHUB_ACTIONS="" scripts/core-testing.sh
+          EXIT_CODE=$?
+          exit $EXIT_CODE
 
   shellcheck:
     name: Shellcheck

.pre-commit-config.yaml

@@ -1,10 +1,3 @@
-# For pre-commit.ci
-ci:
-  # Defer autoupdate to quarterly (there is no 'off' button) to have renovate pick up first
-  autoupdate_schedule: quarterly
-  skip: [test-core-prep, test-pip-prep, testing, quality]
-  submodules: true
-
 default_language_version:
   # force all unspecified python hooks to run python3
   python: python3.13
@@ -62,7 +55,7 @@ repos:
     rev: v2.0.2
     hooks:
       - id: biome-lint
-        additional_dependencies: ["@biomejs/biome@1.8.3"]
+        additional_dependencies: ["@biomejs/biome@2.0.4"]
         name: "Verifying/updating code with biome (improved prettier)"
   - repo: https://github.com/cdce8p/python-typing-update
     rev: v0.7.2

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Versions from 0.4x
 
+### Ongoing
+
+- Maintenance chores (CI fixing)
+
 ### v0.55.1 - 2025-06-22
 
 - Show energy-reset button for Plus devices via plugwise_usb [v0.44.5](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.44.5)

custom_components/plugwise_usb/__init__.py

@@ -4,14 +4,15 @@
 import logging
 from typing import Any, TypedDict
 
+from plugwise_usb import Stick
+from plugwise_usb.api import NodeEvent
+from plugwise_usb.exceptions import NodeError, StickError
+
 from homeassistant.components.device_tracker import ATTR_MAC
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.storage import STORAGE_DIR
-from plugwise_usb import Stick
-from plugwise_usb.api import NodeEvent
-from plugwise_usb.exceptions import NodeError, StickError
 
 from .const import (
     CONF_USB_PATH,
@@ -50,7 +51,7 @@ def _async_migrate_entity_entry(
         hass, config_entry.entry_id, _async_migrate_entity_entry
     )
 
-    api_stick = Stick(config_entry.data[CONF_USB_PATH]) # type: ignore
+    api_stick = Stick(config_entry.data[CONF_USB_PATH])
     api_stick.cache_folder = hass.config.path(
         STORAGE_DIR, f"plugwisecache-{config_entry.entry_id}"
     )
@@ -136,7 +137,10 @@ async def disable_production(call: ServiceCall) -> bool:
         DOMAIN, SERVICE_ENABLE_PRODUCTION, enable_production, SERVICE_USB_DEVICE_SCHEMA
     )
     hass.services.async_register(
-        DOMAIN, SERVICE_DISABLE_PRODUCTION, disable_production, SERVICE_USB_DEVICE_SCHEMA
+        DOMAIN,
+        SERVICE_DISABLE_PRODUCTION,
+        disable_production,
+        SERVICE_USB_DEVICE_SCHEMA,
     )
 
     # Initiate background nodes discovery task
@@ -184,14 +188,10 @@ async def async_remove_config_entry_device(
         try:
             await api_stick.unregister_node(mac)
         except NodeError:
-            _LOGGER.error(
-                "Plugwise device %s removal failed with NodeError", mac
-            )
+            _LOGGER.error("Plugwise device %s removal failed with NodeError", mac)
             return False
 
-        _LOGGER.debug(
-            "Plugwise device %s successfully removed", mac
-        )
+        _LOGGER.debug("Plugwise device %s successfully removed", mac)
         return True
 
     return False