Adapt v2 quirks to new zigpy API (#3280)

TheJulianJES · web-flow · commit 54bed8631cdc · 2024-08-03T22:37:59.000+02:00
* Use new zigpy quirks v2 API

* Bump requirements to zigpy 0.65.2
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 license = {text = "Apache License Version 2.0"}
 requires-python = ">=3.12"
 dependencies = [
-    "zigpy>=0.63.5",
+    "zigpy>=0.65.2",
 ]
 
 [tool.setuptools.packages.find]
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -13,5 +13,5 @@ pytest-sugar
 pytest-timeout
 pytest-asyncio
 pytest>=7.1.3
-zigpy>=0.63.5
+zigpy>=0.65.2
 ruff==0.0.261
diff --git a/zhaquirks/ikea/fourbtnremote.py b/zhaquirks/ikea/fourbtnremote.py
@@ -1,6 +1,6 @@
 """Device handler for IKEA of Sweden TRADFRI remote control."""
 
-from zigpy.quirks.v2 import add_to_registry_v2
+from zigpy.quirks.v2 import QuirkBuilder
 from zigpy.zcl import ClusterType
 
 from zhaquirks.const import (
@@ -29,7 +29,7 @@
 from zhaquirks.ikea import IKEA, DoublingPowerConfig2AAACluster, ScenesCluster
 
 (
-    add_to_registry_v2(IKEA, "Remote Control N2")
+    QuirkBuilder(IKEA, "Remote Control N2")
     .replaces(DoublingPowerConfig2AAACluster)  # will only double for old firmware
     .replaces(ScenesCluster, cluster_type=ClusterType.Client)
     .device_automation_triggers(
@@ -106,4 +106,5 @@
             },
         }
     )
+    .add_to_registry()
 )
diff --git a/zhaquirks/ikea/plug.py b/zhaquirks/ikea/plug.py
@@ -1,13 +1,14 @@
 """IKEA plugs quirk."""
 
-from zigpy.quirks.v2 import add_to_registry_v2
+from zigpy.quirks.v2 import QuirkBuilder
 from zigpy.zcl.clusters.general import LevelControl
 
 from zhaquirks.ikea import IKEA
 
 # remove LevelControl for plugs to not show config options in ZHA
 (
-    add_to_registry_v2(IKEA, "TRADFRI control outlet")
+    QuirkBuilder(IKEA, "TRADFRI control outlet")
     .also_applies_to(IKEA, "TRETAKT Smart plug")
     .removes(LevelControl.cluster_id)
+    .add_to_registry()
 )
diff --git a/zhaquirks/sonoff/button.py b/zhaquirks/sonoff/button.py
@@ -1,6 +1,6 @@
 """Device handler for Sonoff buttons."""
 
-from zigpy.quirks.v2 import add_to_registry_v2
+from zigpy.quirks.v2 import QuirkBuilder
 
 from zhaquirks.const import (
     BUTTON,
@@ -14,7 +14,7 @@
 )
 
 (
-    add_to_registry_v2("eWeLink", "WB01")
+    QuirkBuilder("eWeLink", "WB01")
     .also_applies_to("eWeLink", "SNZB-01P")
     .device_automation_triggers(
         {
@@ -23,4 +23,5 @@
             (LONG_PRESS, BUTTON): {COMMAND: COMMAND_OFF},
         }
     )
+    .add_to_registry()
 )

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ readme = "README.md"`
`14`	`14`	`license = {text = "Apache License Version 2.0"}`
`15`	`15`	`requires-python = ">=3.12"`
`16`	`16`	`dependencies = [`
`17`		`- "zigpy>=0.63.5",`
	`17`	`+ "zigpy>=0.65.2",`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`[tool.setuptools.packages.find]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`"""Device handler for IKEA of Sweden TRADFRI remote control."""`
`2`	`2`
`3`		`-from zigpy.quirks.v2 import add_to_registry_v2`
	`3`	`+from zigpy.quirks.v2 import QuirkBuilder`
`4`	`4`	`from zigpy.zcl import ClusterType`
`5`	`5`
`6`	`6`	`from zhaquirks.const import (`
`@@ -29,7 +29,7 @@`
`29`	`29`	`from zhaquirks.ikea import IKEA, DoublingPowerConfig2AAACluster, ScenesCluster`
`30`	`30`
`31`	`31`	`(`
`32`		`- add_to_registry_v2(IKEA, "Remote Control N2")`
	`32`	`+ QuirkBuilder(IKEA, "Remote Control N2")`
`33`	`33`	`.replaces(DoublingPowerConfig2AAACluster) # will only double for old firmware`
`34`	`34`	`.replaces(ScenesCluster, cluster_type=ClusterType.Client)`
`35`	`35`	`.device_automation_triggers(`
`@@ -106,4 +106,5 @@`
`106`	`106`	`},`
`107`	`107`	`}`
`108`	`108`	`)`
	`109`	`+ .add_to_registry()`
`109`	`110`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,14 @@`
`1`	`1`	`"""IKEA plugs quirk."""`
`2`	`2`
`3`		`-from zigpy.quirks.v2 import add_to_registry_v2`
	`3`	`+from zigpy.quirks.v2 import QuirkBuilder`
`4`	`4`	`from zigpy.zcl.clusters.general import LevelControl`
`5`	`5`
`6`	`6`	`from zhaquirks.ikea import IKEA`
`7`	`7`
`8`	`8`	`# remove LevelControl for plugs to not show config options in ZHA`
`9`	`9`	`(`
`10`		`- add_to_registry_v2(IKEA, "TRADFRI control outlet")`
	`10`	`+ QuirkBuilder(IKEA, "TRADFRI control outlet")`
`11`	`11`	`.also_applies_to(IKEA, "TRETAKT Smart plug")`
`12`	`12`	`.removes(LevelControl.cluster_id)`
	`13`	`+ .add_to_registry()`
`13`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`"""Device handler for Sonoff buttons."""`
`2`	`2`
`3`		`-from zigpy.quirks.v2 import add_to_registry_v2`
	`3`	`+from zigpy.quirks.v2 import QuirkBuilder`
`4`	`4`
`5`	`5`	`from zhaquirks.const import (`
`6`	`6`	`BUTTON,`
`@@ -14,7 +14,7 @@`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`(`
`17`		`- add_to_registry_v2("eWeLink", "WB01")`
	`17`	`+ QuirkBuilder("eWeLink", "WB01")`
`18`	`18`	`.also_applies_to("eWeLink", "SNZB-01P")`
`19`	`19`	`.device_automation_triggers(`
`20`	`20`	`{`
`@@ -23,4 +23,5 @@`
`23`	`23`	`(LONG_PRESS, BUTTON): {COMMAND: COMMAND_OFF},`
`24`	`24`	`}`
`25`	`25`	`)`
	`26`	`+ .add_to_registry()`
`26`	`27`	`)`