Merge ASYNC-branch into MAIN

.devcontainer/devcontainer.json

@@ -0,0 +1,58 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+  "name": "Python 3",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/python:3.12",
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/pylint:2": {}
+  },
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "git config --global --add safe.directory /workspaces/plugwise_usb-beta && scripts/python-venv.sh && . .venv/bin/activate",
+  // Configure tool-specific properties.
+  // "customizations": {},
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+  // Customizations
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-python.pylint",
+        "github.vscode-pull-request-github",
+        "ryanluker.vscode-coverage-gutters",
+        "ms-python.vscode-pylance",
+        "donjayamanne.python-extension-pack"
+      ],
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "terminal.integrated.profiles.linux": {
+          "bash": {
+            "path": "bash",
+            "icon": "terminal-bash"
+          }
+        },
+        "files.eol": "\n",
+        "editor.tabSize": 4,
+        "python.pythonPath": "/usr/bin/python3",
+        "python.analysis.autoSearchPaths": false,
+        // This makes sure the home assistant types are loaded into the editor
+        "python.analysis.extraPaths": [
+          "/home/vscode/.local/lib/python3.12/site-packages/"
+        ],
+        "python.linting.pylintEnabled": true,
+        "python.linting.enabled": true,
+        "python.formatting.provider": "ruff",
+        "editor.formatOnPaste": false,
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "files.trimTrailingWhitespace": true
+      }
+    }
+  },
+  "appPort": 8123
+}

.gitattributes

@@ -0,0 +1,9 @@
+# Autodetect text files
+* text=auto eol=lf
+
+# ...Unless the name matches the following
+# overriding patterns
+
+# Definitively text files
+*.py text
+*.sh lf

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 # 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 (master/released)
+name: Test against HA-core using pytest-homeassistant-custom-component
 
 env:
   CACHE_VERSION: 10
@@ -18,35 +18,24 @@ jobs:
   # Prepare default python version environment
   ha-core-prepare:
     runs-on: ubuntu-latest
-    name: Setup for HA-core (release)
+    name: Setup for HA-core
     steps:
       - name: Check out committed code
         uses: actions/[email protected]
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Restore base HA-core Python ${{ env.DEFAULT_PYTHON }} environment
-        id: cache-hacore
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-hacore
-        with:
-          path: ./
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-hacore-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('./custom_components/plugwise_usb/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 (master/release)
+      - name: Prepare virtual env for testing
+        run: |
+          scripts/setup_test.sh
+      - name: Test
+        run: |
+          scripts/tests_and_coverage.sh test_and_coverage
+      - name: Quality
         run: |
-          GITHUB_ACTIONS="" BRANCH="master" scripts/core-testing.sh
+          scripts/tests_and_coverage.sh linting
 
   shellcheck:
     name: Shellcheck

.gitignore

@@ -2,8 +2,13 @@ __pycache__
 .vscode
 ha-core
 venv
+.venv
+build
+dist
+*.egg-info
 *.sedbck
 *.swp
 *.rej
 *.orig
 manual_clone_ha
+.coverage

CHANGELOG.md

@@ -2,8 +2,18 @@
 
 ## Versions from 0.4x
 
-### Ongoing
-
+### v0.50.0
+
+- Link to plugwise_usb v0.40.0 - fully reworked [async version](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.40.0)
+- Rework custom_component code to async
+- Replace `device-add` service by `enable auto-joining` service
+- Remove device-remove service, remove a device via its DELETE-button (shown in HA)
+- Import and use DeviceInfo, add the Stick as the `via_device`, the other devices are linked to the Stick
+- Implement a [HA Core improvement](https://github.com/home-assistant/core/pull/138039)
+- Add support for devices showing energy production data
+- Add initial support for Scan and Sense (untested - please test if you have such devices)
+- Bump python to `3.13`
+- Add/improve test-code
 - Fix `pre-commit` `prettier` (replace with `biome`)
 - Fix python`3.12` compatibility, use of `uv` and improved ha-core handling from `plugwise-beta`
 - TODO: running hasfest with `--requirements` takes forever (apparently checking all), skipped it for now