jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump ZHA dependencies (#128539)

Browse Source 
* Bump ZHA dependencies

* Remove unused ZHA color modes

* Rename `cluster` to `ota_cluster` in update tests to unshadow `cluster` in `endpoint_reply`

---------

Co-authored-by: TheJulianJES <TheJulianJES@users.noreply.github.com>
This commit is contained in:
puddly 2024-10-16 22:15:00 -04:00 committed by GitHub
parent 72f1c358d9
commit f6270d9cfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/zha/light.py
View File

@ -44,12 +44,7 @@ ZHA_TO_HA_COLOR_MODE = {
ZhaColorMode.ONOFF: ColorMode.ONOFF, ZhaColorMode.ONOFF: ColorMode.ONOFF,
ZhaColorMode.BRIGHTNESS: ColorMode.BRIGHTNESS, ZhaColorMode.BRIGHTNESS: ColorMode.BRIGHTNESS,
ZhaColorMode.COLOR_TEMP: ColorMode.COLOR_TEMP, ZhaColorMode.COLOR_TEMP: ColorMode.COLOR_TEMP,
ZhaColorMode.HS: ColorMode.HS,
ZhaColorMode.XY: ColorMode.XY, ZhaColorMode.XY: ColorMode.XY,
ZhaColorMode.RGB: ColorMode.RGB,
ZhaColorMode.RGBW: ColorMode.RGBW,
ZhaColorMode.RGBWW: ColorMode.RGBWW,
ZhaColorMode.WHITE: ColorMode.WHITE,
} }
HA_TO_ZHA_COLOR_MODE = {v: k for k, v in ZHA_TO_HA_COLOR_MODE.items()} HA_TO_ZHA_COLOR_MODE = {v: k for k, v in ZHA_TO_HA_COLOR_MODE.items()}

2
homeassistant/components/zha/manifest.json
View File

@ -21,7 +21,7 @@
"zha", "zha",
"universal_silabs_flasher" "universal_silabs_flasher"
], ],
"requirements": ["universal-silabs-flasher==0.0.22", "zha==0.0.34"], "requirements": ["universal-silabs-flasher==0.0.23", "zha==0.0.35"],
"usb": [ "usb": [
{ {
"vid": "10C4", "vid": "10C4",

4
requirements_all.txt
View File

@ -2887,7 +2887,7 @@ unifi_ap==0.0.1
unifiled==0.11 unifiled==0.11
# homeassistant.components.zha # homeassistant.components.zha
universal-silabs-flasher==0.0.22 universal-silabs-flasher==0.0.23
# homeassistant.components.upb # homeassistant.components.upb
upb-lib==0.5.8 upb-lib==0.5.8
@ -3053,7 +3053,7 @@ zeroconf==0.135.0
zeversolar==0.3.1 zeversolar==0.3.1
# homeassistant.components.zha # homeassistant.components.zha
zha==0.0.34 zha==0.0.35
# homeassistant.components.zhong_hong # homeassistant.components.zhong_hong
zhong-hong-hvac==1.0.12 zhong-hong-hvac==1.0.12

4
requirements_test_all.txt
View File

@ -2288,7 +2288,7 @@ ultraheat-api==0.5.7
unifi-discovery==1.2.0 unifi-discovery==1.2.0
# homeassistant.components.zha # homeassistant.components.zha
universal-silabs-flasher==0.0.22 universal-silabs-flasher==0.0.23
# homeassistant.components.upb # homeassistant.components.upb
upb-lib==0.5.8 upb-lib==0.5.8
@ -2430,7 +2430,7 @@ zeroconf==0.135.0
zeversolar==0.3.1 zeversolar==0.3.1
# homeassistant.components.zha # homeassistant.components.zha
zha==0.0.34 zha==0.0.35
# homeassistant.components.zwave_js # homeassistant.components.zwave_js
zwave-js-server-python==0.58.1 zwave-js-server-python==0.58.1

38
tests/components/zha/test_update.py
View File

@ -272,7 +272,7 @@ async def test_firmware_update_success(
) -> None: ) -> None:
"""Test ZHA update platform - firmware update success.""" """Test ZHA update platform - firmware update success."""
await setup_zha() await setup_zha()
zha_device, cluster, fw_image, installed_fw_version = await setup_test_data( zha_device, ota_cluster, fw_image, installed_fw_version = await setup_test_data(
hass, zigpy_device_mock hass, zigpy_device_mock
) )
@ -284,7 +284,7 @@ async def test_firmware_update_success(
assert hass.states.get(entity_id).state == STATE_UNKNOWN assert hass.states.get(entity_id).state == STATE_UNKNOWN
# simulate an image available notification # simulate an image available notification
await cluster._handle_query_next_image( await ota_cluster._handle_query_next_image(
foundation.ZCLHeader.cluster( foundation.ZCLHeader.cluster(
tsn=0x12, command_id=general.Ota.ServerCommandDefs.query_next_image.id tsn=0x12, command_id=general.Ota.ServerCommandDefs.query_next_image.id
), ),
@ -306,14 +306,14 @@ async def test_firmware_update_success(
attrs[ATTR_LATEST_VERSION] == f"0x{fw_image.firmware.header.file_version:08x}" attrs[ATTR_LATEST_VERSION] == f"0x{fw_image.firmware.header.file_version:08x}"
) )
async def endpoint_reply(cluster_id, tsn, data, command_id): async def endpoint_reply(cluster, sequence, data, **kwargs):
if cluster_id == general.Ota.cluster_id: if cluster == general.Ota.cluster_id:
hdr, cmd = cluster.deserialize(data) hdr, cmd = ota_cluster.deserialize(data)
if isinstance(cmd, general.Ota.ImageNotifyCommand): if isinstance(cmd, general.Ota.ImageNotifyCommand):
zha_device.device.device.packet_received( zha_device.device.device.packet_received(
make_packet( make_packet(
zha_device.device.device, zha_device.device.device,
cluster, ota_cluster,
general.Ota.ServerCommandDefs.query_next_image.name, general.Ota.ServerCommandDefs.query_next_image.name,
field_control=general.Ota.QueryNextImageCommand.FieldControl.HardwareVersion, field_control=general.Ota.QueryNextImageCommand.FieldControl.HardwareVersion,
manufacturer_code=fw_image.firmware.header.manufacturer_id, manufacturer_code=fw_image.firmware.header.manufacturer_id,
@ -333,7 +333,7 @@ async def test_firmware_update_success(
zha_device.device.device.packet_received( zha_device.device.device.packet_received(
make_packet( make_packet(
zha_device.device.device, zha_device.device.device,
cluster, ota_cluster,
general.Ota.ServerCommandDefs.image_block.name, general.Ota.ServerCommandDefs.image_block.name,
field_control=general.Ota.ImageBlockCommand.FieldControl.RequestNodeAddr, field_control=general.Ota.ImageBlockCommand.FieldControl.RequestNodeAddr,
manufacturer_code=fw_image.firmware.header.manufacturer_id, manufacturer_code=fw_image.firmware.header.manufacturer_id,
@ -360,7 +360,7 @@ async def test_firmware_update_success(
zha_device.device.device.packet_received( zha_device.device.device.packet_received(
make_packet( make_packet(
zha_device.device.device, zha_device.device.device,
cluster, ota_cluster,
general.Ota.ServerCommandDefs.image_block.name, general.Ota.ServerCommandDefs.image_block.name,
field_control=general.Ota.ImageBlockCommand.FieldControl.RequestNodeAddr, field_control=general.Ota.ImageBlockCommand.FieldControl.RequestNodeAddr,
manufacturer_code=fw_image.firmware.header.manufacturer_id, manufacturer_code=fw_image.firmware.header.manufacturer_id,
@ -398,7 +398,7 @@ async def test_firmware_update_success(
zha_device.device.device.packet_received( zha_device.device.device.packet_received(
make_packet( make_packet(
zha_device.device.device, zha_device.device.device,
cluster, ota_cluster,
general.Ota.ServerCommandDefs.upgrade_end.name, general.Ota.ServerCommandDefs.upgrade_end.name,
status=foundation.Status.SUCCESS, status=foundation.Status.SUCCESS,
manufacturer_code=fw_image.firmware.header.manufacturer_id, manufacturer_code=fw_image.firmware.header.manufacturer_id,
@ -417,7 +417,7 @@ async def test_firmware_update_success(
assert cmd.upgrade_time == 0 assert cmd.upgrade_time == 0
def read_new_fw_version(*args, **kwargs): def read_new_fw_version(*args, **kwargs):
cluster.update_attribute( ota_cluster.update_attribute(
attrid=general.Ota.AttributeDefs.current_file_version.id, attrid=general.Ota.AttributeDefs.current_file_version.id,
value=fw_image.firmware.header.file_version, value=fw_image.firmware.header.file_version,
) )
@ -427,9 +427,9 @@ async def test_firmware_update_success(
) )
}, {} }, {}
cluster.read_attributes.side_effect = read_new_fw_version ota_cluster.read_attributes.side_effect = read_new_fw_version
cluster.endpoint.reply = AsyncMock(side_effect=endpoint_reply) ota_cluster.endpoint.reply = AsyncMock(side_effect=endpoint_reply)
await hass.services.async_call( await hass.services.async_call(
UPDATE_DOMAIN, UPDATE_DOMAIN,
SERVICE_INSTALL, SERVICE_INSTALL,
@ -465,7 +465,7 @@ async def test_firmware_update_raises(
) -> None: ) -> None:
"""Test ZHA update platform - firmware update raises.""" """Test ZHA update platform - firmware update raises."""
await setup_zha() await setup_zha()
zha_device, cluster, fw_image, installed_fw_version = await setup_test_data( zha_device, ota_cluster, fw_image, installed_fw_version = await setup_test_data(
hass, zigpy_device_mock hass, zigpy_device_mock
) )
@ -475,7 +475,7 @@ async def test_firmware_update_raises(
assert hass.states.get(entity_id).state == STATE_UNKNOWN assert hass.states.get(entity_id).state == STATE_UNKNOWN
# simulate an image available notification # simulate an image available notification
await cluster._handle_query_next_image( await ota_cluster._handle_query_next_image(
foundation.ZCLHeader.cluster( foundation.ZCLHeader.cluster(
tsn=0x12, command_id=general.Ota.ServerCommandDefs.query_next_image.id tsn=0x12, command_id=general.Ota.ServerCommandDefs.query_next_image.id
), ),
@ -498,14 +498,14 @@ async def test_firmware_update_raises(
attrs[ATTR_LATEST_VERSION] == f"0x{fw_image.firmware.header.file_version:08x}" attrs[ATTR_LATEST_VERSION] == f"0x{fw_image.firmware.header.file_version:08x}"
) )
async def endpoint_reply(cluster_id, tsn, data, command_id): async def endpoint_reply(cluster, sequence, data, **kwargs):
if cluster_id == general.Ota.cluster_id: if cluster == general.Ota.cluster_id:
hdr, cmd = cluster.deserialize(data) hdr, cmd = ota_cluster.deserialize(data)
if isinstance(cmd, general.Ota.ImageNotifyCommand): if isinstance(cmd, general.Ota.ImageNotifyCommand):
zha_device.device.device.packet_received( zha_device.device.device.packet_received(
make_packet( make_packet(
zha_device.device.device, zha_device.device.device,
cluster, ota_cluster,
general.Ota.ServerCommandDefs.query_next_image.name, general.Ota.ServerCommandDefs.query_next_image.name,
field_control=general.Ota.QueryNextImageCommand.FieldControl.HardwareVersion, field_control=general.Ota.QueryNextImageCommand.FieldControl.HardwareVersion,
manufacturer_code=fw_image.firmware.header.manufacturer_id, manufacturer_code=fw_image.firmware.header.manufacturer_id,
@ -524,7 +524,7 @@ async def test_firmware_update_raises(
assert cmd.image_size == fw_image.firmware.header.image_size assert cmd.image_size == fw_image.firmware.header.image_size
raise DeliveryError("failed to deliver") raise DeliveryError("failed to deliver")
cluster.endpoint.reply = AsyncMock(side_effect=endpoint_reply) ota_cluster.endpoint.reply = AsyncMock(side_effect=endpoint_reply)
with pytest.raises(HomeAssistantError): with pytest.raises(HomeAssistantError):
await hass.services.async_call( await hass.services.async_call(
UPDATE_DOMAIN, UPDATE_DOMAIN,