whenever

Author: kellerza

hass-addon-sunsynk-edge/CHANGELOG.md

@@ -8,6 +8,7 @@ All items below are changes since add-on **1.3.0**.
 
 - Failed Modbus writes no longer update the local register cache. #692
 - Fix AsyncCallback checks. #693
+- Bump whenever to 0.11
 
 ## Release 1.3.0
 

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
   "modbus-connection[pymodbus,tmodbus]>=4.7",
   "mqtt-entity[options]>=1.2.5",
   "prettytable>=3.17,<4",
-  "whenever>=0.10,<11",
+  "whenever>=0.11,<0.12",
 ]
 optional-dependencies.solarman = [ "pysolarmanv5==3.0.6" ]
 urls.Homepage = "https://kellerza.github.io/sunsynk/"

src/ha_addon_sunsynk_multi/timer_callback.py

@@ -6,7 +6,7 @@
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
 
-from whenever import Time, ZonedDateTime
+from whenever import SYSTEM_TZ, Time, ZonedDateTime
 
 from sunsynk.helpers import slug
 
@@ -90,7 +90,7 @@ class ToggleLogCallback(Callback):
 
     def calc_next_run(self) -> None:
         """Calculate the next run times."""
-        now = ZonedDateTime.now_in_system_tz()
+        now = ZonedDateTime.now(SYSTEM_TZ)
         self.next_runs = [
             n if n > now else n.add(days=1)
             for n in (now.replace_time(t) for t in self.times)
@@ -101,19 +101,19 @@ def calc_next_run(self) -> None:
     @property
     def next_run0(self) -> int:
         """Return next run seconds of entry 0."""
-        return self.next_runs[0].timestamp_millis() // 1000
+        return self.next_runs[0].timestamp(unit="millisecond") // 1000
 
     def __post_init__(self) -> None:
         """Init."""
         assert len(self.times) > 0
-        self.next_runs = [ZonedDateTime.now_in_system_tz()]
+        self.next_runs = [ZonedDateTime.now(SYSTEM_TZ)]
         self.task = None  # type:ignore[assignment]
         self.calc_next_run()
         self.original_level = _LOG.level
 
     async def mute_log(self) -> None:
         """Set log level to critical, and reset after duration."""
-        now, _, _ = ZonedDateTime.now_in_system_tz().format_iso().partition("T")
+        now, _, _ = ZonedDateTime.now(SYSTEM_TZ).format_iso().partition("T")
         _LOG.info(
             "[%s] Disabling the log for %s seconds",
             now,
@@ -184,7 +184,7 @@ async def run_callbacks(callbacks: list[Callback]) -> None:
     """Run the timer."""
     while True:
         now_s = 0
-        now_ms = ZonedDateTime.now_in_system_tz().timestamp_millis()
+        now_ms = ZonedDateTime.now(SYSTEM_TZ).timestamp(unit="millisecond")
         for cb in callbacks:
             if now_ms < cb.due_at_ms():
                 continue

src/tests/ha_addon_sunsynk_multi/test_timer.py

@@ -57,16 +57,16 @@ def run2(now: int) -> None:
     ):
         now_ms = 2000
 
-        def get_now() -> MagicMock:
+        def get_now(*_a: object, **_k: object) -> MagicMock:
             nonlocal now_ms
             if now_ms > 19990:
                 raise IndexError
             res = MagicMock()
-            res.timestamp_millis.return_value = now_ms
+            res.timestamp.return_value = now_ms
             now_ms += TICK_MS
             return res
 
-        mock_zdt.now_in_system_tz.side_effect = get_now
+        mock_zdt.now.side_effect = get_now
 
         try:
             await run_callbacks(cbs)
@@ -115,17 +115,17 @@ def cb_c(_now: int) -> None:
         ),
     ):
 
-        def get_now() -> MagicMock:
+        def get_now(*_a: object, **_k: object) -> MagicMock:
             nonlocal now_ms
             if now_ms > 2990:
                 raise IndexError
             last_now_ms[0] = now_ms
             res = MagicMock()
-            res.timestamp_millis.return_value = now_ms
+            res.timestamp.return_value = now_ms
             now_ms += TICK_MS
             return res
 
-        mock_zdt.now_in_system_tz.side_effect = get_now
+        mock_zdt.now.side_effect = get_now
 
         try:
             await run_callbacks(cbs)