Make automatic joining work

.github/workflows/merge.yml

@@ -5,14 +5,15 @@ name: Latest release
 
 env:
   CACHE_VERSION: 21
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
 
 # Only run on merges
 on:
   pull_request:
     types: closed
     branches:
       - main
+      - async
 
 jobs:
   publishing:
@@ -22,10 +23,10 @@ jobs:
     if: github.event.pull_request.merged == true
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
       - 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: Install pypa/build

.github/workflows/verify.yml

@@ -4,8 +4,8 @@
 name: Latest commit
 
 env:
-  CACHE_VERSION: 22
-  DEFAULT_PYTHON: "3.12"
+  CACHE_VERSION: 10
+  DEFAULT_PYTHON: "3.13"
   PRE_COMMIT_HOME: ~/.cache/pre-commit
 
 on:
@@ -22,15 +22,15 @@ jobs:
     name: Prepare
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -48,12 +48,11 @@ jobs:
           pip install virtualenv --upgrade
           python -m venv venv
           . venv/bin/activate
-          pip install uv
-          uv pip install -U pip setuptools wheel
-          uv pip install -r requirements_test.txt -r requirements_commit.txt
+          pip install -U pip setuptools wheel
+          pip install -r requirements_test.txt -r requirements_commit.txt
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -72,17 +71,17 @@ jobs:
     needs: prepare
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
         with:
           persist-credentials: false
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -98,7 +97,7 @@ jobs:
       - name: Ruff (check)
         run: |
           . venv/bin/activate
-          #ruff check plugwise_usb/*py tests/*py
+          #ruff plugwise_usb/*py tests/*py
           echo "***"
           echo "***"
           echo "Code is not up to par for ruff, skipping"
@@ -108,7 +107,7 @@ jobs:
         if: failure()
         run: |
           . venv/bin/activate
-          ruff check --fix plugwise_usb/*py tests/*py
+          ruff --fix plugwise_usb/*py tests/*py
           git config --global user.name 'autoruff'
           git config --global user.email 'plugwise_usb@users.noreply.github.com'
           git remote set-url origin https://x-access-token:${{ secrets.PAT_CT }}@github.com/$GITHUB_REPOSITORY
@@ -125,15 +124,15 @@ jobs:
       - dependencies_check
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -148,7 +147,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ env.PRE_COMMIT_HOME }}
           key: |
@@ -173,18 +172,18 @@ jobs:
     needs: commitcheck
     strategy:
       matrix:
-        python-version: ["3.12", "3.11", "3.10"]
+        python-version: ["3.13"]
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -200,32 +199,31 @@ jobs:
         run: |
           python -m venv venv
           . venv/bin/activate
-          pip install uv
-          uv pip install -U pip setuptools wheel
-          # uv pip install -r requirements_test.txt
+          pip install -U pip setuptools wheel
+          #pip install -r requirements_test.txt
           # 20220124 Mimic setup_test.sh
-          uv pip install --upgrade -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
-          uv pip install --upgrade pytest-asyncio
+          pip install --upgrade -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
+          pip install --upgrade pytest-asyncio
 
   pytest:
     runs-on: ubuntu-latest
     name: Run pytest using Python ${{ matrix.python-version }}
     needs: prepare-test-cache
     strategy:
       matrix:
-        python-version: ["3.12", "3.11", "3.10"]
+        python-version: ["3.13"]
 
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -242,7 +240,7 @@ jobs:
           . venv/bin/activate
           pytest --log-level info tests/*.py --cov='.'
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -255,17 +253,17 @@ jobs:
     needs: pytest
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
         with:
           persist-credentials: false
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -295,7 +293,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
 
@@ -305,7 +303,7 @@ jobs:
     name: Dependency
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - name: Run dependency checker
         run: scripts/dependencies_check.sh debug
 
@@ -315,15 +313,15 @@ jobs:
     needs: pytest
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -337,7 +335,7 @@ jobs:
           echo "Failed to restore Python virtual environment from cache"
           exit 1
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v4.2.1
       - name: Combine coverage results
         run: |
           . venv/bin/activate
@@ -350,7 +348,7 @@ jobs:
           echo "***"
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v5.4.2
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -360,15 +358,15 @@ jobs:
     needs: [coverage, mypy]
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-
@@ -403,15 +401,15 @@ jobs:
     needs: coverage
     steps:
       - name: Check out committed code
-        uses: actions/checkout@v4
+        uses: actions/checkout@4.2.2
       - 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 Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v4
+        uses: actions/cache@v4.2.3
         with:
           path: venv
           key: >-

.gitignore

@@ -11,6 +11,7 @@ tests/__pycache__
 .coverage
 .vscode
 venv
+.venv
 fixtures/*
 !fixtures/.keep
 *.sedbck

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
 
 default_language_version:
   # force all unspecified python hooks to run python3
-  python: python3.12
+  python: python3.13
 
 repos:
   # Run manually in CI skipping the branch checks

CHANGELOG.md

@@ -1,18 +1,28 @@
 # Changelog
 
-## Ongoing
+## v0.40.0 (a22)
 
-- Ensure CI process remains operational
-- Bumped pip to now prepend uv for using quicker dependency resolving and installing
-- As for latest HA Core USB team should rework to python 3.12 (not still 3.10)
+- Correcting messageflow to HA
+
+## v0.40.0 (a4)
+
+Full rewrite of library into async version. Main list of changes:
+
+- Full async and typed
+- Improved protocol handling
+- Support for local caching of collected data to improve startup and device detection
+- Improved handling of edge cases especially for energy data collection
+- Based on detected firmware version enable the supported features
+- API details about supported data is combined into api.py
+- Added tests
 
 ## v0.31.4(a0)
 
 - Re-add python 3.12 checks and compatibility
 
 ## v0.31.3
 
-- Bugfix midnight rollover for cicrles without power usage registered during first hour(s)
+- Bugfix midnight rollover for circles without power usage registered during first hour(s)
 
 ## v0.31.2