Merge pull request #216 from plugwise/feature/arnout/python_3_13

ArnoutD · web-flow · commit 6eb4498345d3 · 2025-02-07T11:44:51.000+01:00
Feature/arnout/python 3 13
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ name: Test against HA-core using pytest-homeassistant-custom-component
 
 env:
   CACHE_VERSION: 9
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
 
 on:
   workflow_dispatch:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,12 +7,12 @@ 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
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.5
     hooks:
       - id: ruff
         name: "Ruff-ing code"
@@ -28,13 +28,13 @@ repos:
         args:
           - --branch=main
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         name: "Checking pyupgrade"
         args: [--py39-plus]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         name: "Verifying/updating code for spelling issues"
@@ -44,7 +44,7 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.10
+    rev: 1.8.2
     hooks:
       - id: bandit
         name: "Linting with bandit"
@@ -86,7 +86,7 @@ repos:
         language: script
         pass_filenames: false
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.44.0
     hooks:
       - id: markdownlint
         name: "Linting Markdown"
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,7 +3,7 @@ name = "plugwise_usb-beta"
 version = "0.40.8b1"
 description = "Plugwise USB custom_component (BETA)"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 license = {file = "LICENSE"}
 keywords = ["Plugwise", "Switch", "Circle", "Plus"]
 authors = [
@@ -28,7 +28,7 @@ dependencies = ["homeassistant", "plugwise-usb"]
 "Bug Reports" = "https://github.com/plugwise/plugwise_usb-beta/issues"
 
 [tool.black]
-target-version = ["py312"]
+target-version = ["py313"]
 exclude = 'generated'
 
 [tool.pylint.MASTER]
@@ -135,7 +135,7 @@ overgeneral-exceptions = [
 ]
 
 [tool.ruff]
-target-version = "py312"
+target-version = "py313"
 
 lint.select = [
     "B007", # Loop control variable {name} not used within loop body
@@ -216,13 +216,9 @@ combine-as-imports = true
 [tool.ruff.lint.mccabe]
 max-complexity = 25
 
-[tool.pytest]
-addopts = [
-    "--cov=custom_components"
-]
-asyncio_default_fixture_loop_scope = "session"
-
 [tool.pytest.ini_options]
+addopts = "--cov=plugwise_usb"
+asyncio_default_fixture_loop_scope = "function"
 pythonpath = "src"
 testpaths = "tests"
 norecursedirs = ".git"
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -2,5 +2,6 @@ pytest
 pytest-cov
 pytest-asyncio
 pytest-homeassistant-custom-component
+aiousbwatcher
 # From our manifest.json for our custom component
-plugwise_usb @ https://test-files.pythonhosted.org/packages/90/5f/9cdaa7c322da4987c3820b54eacebad2911b6e7a06550c56b7921944ee90/plugwise_usb-0.40.0a21.tar.gz#plugwise-usb==0.40.0a21
+plugwise_usb @ https://test-files.pythonhosted.org/packages/d0/05/f52b59d222cd857284b00aa77e237ffdd25acc8955b5ebc2ff411822448b/plugwise_usb-0.40.0a27.tar.gz#plugwise-usb==0.40.0a27
diff --git a/scripts/python-venv.sh b/scripts/python-venv.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-pyversions=(3.12)
+pyversions=(3.13)
 my_path=$(git rev-parse --show-toplevel)
 my_venv=${my_path}/.venv
 
diff --git a/src/custom_components/plugwise_usb/__init__.py b/src/custom_components/plugwise_usb/__init__.py
@@ -1,6 +1,5 @@
 """Support for Plugwise devices connected to a Plugwise USB-stick."""
 
-
 import logging
 from typing import Any, TypedDict
 
diff --git a/src/custom_components/plugwise_usb/config_flow.py b/src/custom_components/plugwise_usb/config_flow.py
@@ -8,14 +8,14 @@
 import voluptuous as vol
 
 from homeassistant.components import usb
-from homeassistant.config_entries import ConfigFlow
+from homeassistant.config_entries import SOURCE_USER, ConfigFlow
 from homeassistant.const import CONF_BASE
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from plugwise_usb import Stick
 from plugwise_usb.exceptions import StickError
 
-from .const import CONF_MANUAL_PATH, CONF_USB_PATH, DOMAIN
+from .const import CONF_MANUAL_PATH, CONF_USB_PATH, DOMAIN, MANUAL_PATH
 
 
 @callback
@@ -94,6 +94,7 @@ async def async_step_user(
                     title="Stick", data={CONF_USB_PATH: device_path}
                 )
         return self.async_show_form(
+            step_id=SOURCE_USER,
             data_schema=vol.Schema(
                 {vol.Required(CONF_USB_PATH): vol.In(list_of_ports)}
             ),
@@ -116,6 +117,7 @@ async def async_step_manual_path(
                     title="Stick", data={CONF_USB_PATH: device_path}
                 )
         return self.async_show_form(
+            step_id=MANUAL_PATH,
             data_schema=vol.Schema(
                 {vol.Required(CONF_USB_PATH, default="/dev/ttyUSB0"): str}
             ),
diff --git a/src/custom_components/plugwise_usb/const.py b/src/custom_components/plugwise_usb/const.py
@@ -14,6 +14,7 @@
 UNSUB_NODE_LOADED: Final = "Unsubcribe_from_node_loaded_event"
 COORDINATOR: Final = "coordinator"
 CONF_MANUAL_PATH: Final = "Enter Manually"
+MANUAL_PATH: Final = "manual_path"
 STICK: Final = "stick"
 NODES: Final = "nodes"
 USB: Final = "usb"
diff --git a/src/custom_components/plugwise_usb/entity.py b/src/custom_components/plugwise_usb/entity.py
@@ -46,8 +46,7 @@ def __init__(
             "model_id": self._node_info.model_type,
             "sw_version": f"{self._node_info.firmware}",
         }
-        self._attr_unique_id = f"{
-            self._node_info.mac}-{entity_description.key}"
+        self._attr_unique_id = f"{self._node_info.mac}-{entity_description.key}"
         self.entity_description = entity_description
         self._subscribe_to_feature_fn = node_duc.node.subscribe_to_feature_update
         self.unsubscribe_push_events: Callable[[], None] | None = None
diff --git a/src/custom_components/plugwise_usb/manifest.json b/src/custom_components/plugwise_usb/manifest.json
@@ -9,7 +9,7 @@
   "iot_class": "local_polling",
   "loggers": ["plugwise_usb"],
   "requirements": [
-    "https://test-files.pythonhosted.org/packages/90/5f/9cdaa7c322da4987c3820b54eacebad2911b6e7a06550c56b7921944ee90/plugwise_usb-0.40.0a21.tar.gz#plugwise-usb==0.40.0a21"
+    "https://test-files.pythonhosted.org/packages/d0/05/f52b59d222cd857284b00aa77e237ffdd25acc8955b5ebc2ff411822448b/plugwise_usb-0.40.0a27.tar.gz#plugwise-usb==0.40.0a27"
   ],
   "version": "0.50.0a11"
 }
diff --git a/src/custom_components/plugwise_usb/number.py b/src/custom_components/plugwise_usb/number.py
@@ -166,9 +166,7 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(
-            self.entity_description.node_feature, None
-        )
+        data = self.coordinator.data.get(self.entity_description.node_feature, None)
         if data is None:
             _LOGGER.debug(
                 "No %s number data for %s",
diff --git a/src/custom_components/plugwise_usb/sensor.py b/src/custom_components/plugwise_usb/sensor.py
@@ -194,9 +194,7 @@ class PlugwiseUSBSensorEntity(PlugwiseUSBEntity, SensorEntity):
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(
-            self.entity_description.node_feature, None
-        )
+        data = self.coordinator.data.get(self.entity_description.node_feature, None)
         if data is None:
             _LOGGER.debug(
                 "No %s sensor data for %s",
diff --git a/src/custom_components/plugwise_usb/strings.json b/src/custom_components/plugwise_usb/strings.json
@@ -97,6 +97,11 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "motion": {
+        "name": "Motion"
+      }
+    },
     "sensor": {
       "power_last_second": {
         "name": "[%key:component::sensor::entity_component::power::name%]"
@@ -110,6 +115,9 @@
       "energy_day_consumption": {
         "name": "Energy consumption today"
       },
+      "last_seen": {
+        "name": "Last seen"
+      },
       "ping_rrt": {
         "name": "Network roundtrip time"
       },
@@ -124,6 +132,12 @@
       },
       "humidity": {
         "name": "[%key:component::sensor::entity_component::humidity::name%]"
+      },
+      "awake_timestamp": {
+        "name": "Last awake"
+      },
+      "awake_reason": {
+        "name": "Awake reason"
       }
     },
     "switch": {
@@ -132,6 +146,26 @@
       },
       "relay_init": {
         "name": "Relay startup"
+      },
+      "motion_daylight_mode": {
+        "name": "Daylight mode"
+      }
+    },
+    "number": {
+      "motion_reset_timer": {
+        "name": "Motion reset timer"
+      },
+      "sed_maintenance_interval": {
+        "name": "Maintenance interval"
+      },
+      "sed_sleep_duration": {
+        "name": "Sleep duration"
+      },
+      "sed_awake_duration": {
+        "name": "Awake duration"
+      },
+      "sed_clock_interval": {
+        "name": "Clock interval"
       }
     }
   }
diff --git a/src/custom_components/plugwise_usb/switch.py b/src/custom_components/plugwise_usb/switch.py
@@ -77,8 +77,7 @@ async def async_add_switch(node_event: NodeEvent, mac: str) -> None:
             return
         entities: list[PlugwiseUSBEntity] = []
         if (node_duc := config_entry.runtime_data[NODES].get(mac)) is not None:
-            _LOGGER.debug("Add switch entities for %s | duc=%s",
-                          mac, node_duc.name)
+            _LOGGER.debug("Add switch entities for %s | duc=%s", mac, node_duc.name)
             entities.extend(
                 [
                     PlugwiseUSBSwitchEntity(node_duc, entity_description)
@@ -131,13 +130,10 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(
-            self.entity_description.node_feature, None
-        )
+        data = self.coordinator.data.get(self.entity_description.node_feature, None)
         if data is None:
             _LOGGER.debug(
-                "No switch data for %s", str(
-                    self.entity_description.node_feature)
+                "No switch data for %s", str(self.entity_description.node_feature)
             )
             return
         self._attr_is_on = getattr(
diff --git a/src/custom_components/plugwise_usb/translations/nl.json b/src/custom_components/plugwise_usb/translations/nl.json
@@ -97,6 +97,11 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "motion": {
+        "name": "Beweging"
+      }
+    },
     "sensor": {
       "power_last_second": {
         "name": "Energie"
@@ -110,6 +115,9 @@
       "energy_day_consumption": {
         "name": "Energie cumulatief vandaag"
       },
+      "last_seen": {
+        "name": "Laatst gezien"
+      },
       "ping_rrt": {
         "name": "Netwerk retourtijd"
       },
@@ -124,6 +132,12 @@
       },
       "humidity": {
         "name": "Luchtvochtigheid"
+      },
+      "awake_timestamp": {
+        "name": "Laatst wakker"
+      },
+      "awake_reason": {
+        "name": "Wakker door"
       }
     },
     "switch": {
@@ -132,6 +146,26 @@
       },
       "relay_init": {
         "name": "Initialisatie schakelaar"
+      },
+      "motion_daylight_mode": {
+        "name": "Daglichtmodus"
+      }
+    },
+    "number": {
+      "motion_reset_timer": {
+        "name": "Bewegingsreset timer"
+      },
+      "sed_maintenance_interval": {
+        "name": "Onderhoudsinterval"
+      },
+      "sed_sleep_duration": {
+        "name": "Slaapduur"
+      },
+      "sed_awake_duration": {
+        "name": "Wakker duur"
+      },
+      "sed_clock_interval": {
+        "name": "Klokinterval"
       }
     }
   }
diff --git a/tests/bandit.yaml b/tests/bandit.yaml
@@ -12,7 +12,6 @@ tests:
   - B317
   - B318
   - B319
-  - B320
   - B601
   - B602
   - B604

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"iot_class": "local_polling",`
`10`	`10`	`"loggers": ["plugwise_usb"],`
`11`	`11`	`"requirements": [`
`12`		`- "https://test-files.pythonhosted.org/packages/90/5f/9cdaa7c322da4987c3820b54eacebad2911b6e7a06550c56b7921944ee90/plugwise_usb-0.40.0a21.tar.gz#plugwise-usb==0.40.0a21"`
	`12`	`+ "https://test-files.pythonhosted.org/packages/d0/05/f52b59d222cd857284b00aa77e237ffdd25acc8955b5ebc2ff411822448b/plugwise_usb-0.40.0a27.tar.gz#plugwise-usb==0.40.0a27"`
`13`	`13`	`],`
`14`	`14`	`"version": "0.50.0a11"`
`15`	`15`	`}`