-
Notifications
You must be signed in to change notification settings - Fork 61
Bump zigpy from 0.91.2 to 0.91.3 #636
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Quirks overriding In this instance, tests fail because of zhaquirks/xiaomi/aqara/thermostat_agl001.py#L97-L99 as I guess this forwarding case is a bit special.. index cb534052..b83fa02c 100644
--- a/zhaquirks/xiaomi/aqara/thermostat_agl001.py
+++ b/zhaquirks/xiaomi/aqara/thermostat_agl001.py
@@ -10,6 +10,8 @@ from typing import Any, Final
from zigpy.profiles import zha
from zigpy.quirks import CustomCluster
import zigpy.types as t
+from zigpy.typing import UNDEFINED, UndefinedType
+from zigpy.zcl import foundation
from zigpy.zcl.clusters.general import Basic, Identify, Ota, Time
from zigpy.zcl.clusters.hvac import Thermostat
from zigpy.zcl.foundation import ZCLAttributeDef
@@ -76,10 +78,13 @@ class ThermostatCluster(CustomCluster, Thermostat):
async def read_attributes(
self,
- attributes: list[int | str],
+ attributes: list[int | str | foundation.ZCLAttributeDef],
allow_cache: bool = False,
only_cache: bool = False,
- manufacturer: int | t.uint16_t | None = None,
+ manufacturer: int
+ | t.uint16_t
+ | UndefinedType
+ | None = UNDEFINED, # Not needed to make tests pass
):
"""Pass reading attributes to Xiaomi cluster if applicable."""
successful_r, failed_r = {}, {}
@@ -95,7 +100,10 @@ class ThermostatCluster(CustomCluster, Thermostat):
remaining_attributes.remove("system_mode")
successful_r, failed_r = await self.endpoint.opple_cluster.read_attributes(
- [SYSTEM_MODE], allow_cache, only_cache, manufacturer
+ [SYSTEM_MODE],
+ allow_cache,
+ only_cache,
+ UNDEFINED, # This makes test pass
)
# convert Xiaomi system_mode to ZCL attribute
if SYSTEM_MODE in successful_r: |
|
Ah, true. I fixed I think we should fix quirks here for both? |
|
I'll put up a ZHA PR in a second, just to keep it separate from this bump. We need to fix that anyway (and the improved manufacturer code handling in zigpy finally fixes an issue where batch reading attributes during initialization always used a manufacturer code or not, messing up mixed reads). But yeah, quirk defaults should also be fixed. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #636 +/- ##
=======================================
Coverage 97.29% 97.29%
=======================================
Files 62 62
Lines 10716 10716
=======================================
Hits 10426 10426
Misses 290 290 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Reverted. |
cf2d90a to
e06d104
Compare
|
A newer version of zigpy exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged. |
|
@dependabot recreate So we can then merge the quirks bump. |
e06d104 to
49f31e8
Compare
Bumps [zigpy](https://github.com/zigpy/zigpy) from 0.91.2 to 0.91.3. - [Release notes](https://github.com/zigpy/zigpy/releases) - [Commits](zigpy/zigpy@0.91.2...0.91.3) --- updated-dependencies: - dependency-name: zigpy dependency-version: 0.91.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
49f31e8 to
4780f32
Compare
|
Superseded by #640. |
Bumps zigpy from 0.91.2 to 0.91.3.
Release notes
Sourced from zigpy's releases.
Commits
8facec0Correctly handlemanufacturer_code=Nonefor attributes and commands (#1756)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)