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

Bump ZHA dependencies (#95478)

Browse Source 
* Bump ZHA dependencies

* Account for new EZSP metadata keys
This commit is contained in:
puddly 2023-06-28 18:35:05 -04:00 committed by GitHub
parent 487dd3f956
commit 392e2af2b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,15 +20,15 @@
"zigpy_znp" "zigpy_znp"
], ],
"requirements": [ "requirements": [
"bellows==0.35.5", "bellows==0.35.6",
"pyserial==3.5", "pyserial==3.5",
"pyserial-asyncio==0.6", "pyserial-asyncio==0.6",
"zha-quirks==0.0.101", "zha-quirks==0.0.101",
"zigpy-deconz==0.21.0", "zigpy-deconz==0.21.0",
"zigpy==0.56.0", "zigpy==0.56.1",
"zigpy-xbee==0.18.0", "zigpy-xbee==0.18.1",
"zigpy-zigate==0.11.0", "zigpy-zigate==0.11.0",
"zigpy-znp==0.11.1" "zigpy-znp==0.11.2"
], ],
"usb": [ "usb": [
{ {

7
homeassistant/components/zha/radio_manager.py
View File

@ -250,11 +250,12 @@ class ZhaRadioManager:
assert self.current_settings is not None assert self.current_settings is not None
metadata = self.current_settings.network_info.metadata["ezsp"]
if ( if (
self.current_settings.node_info.ieee == self.chosen_backup.node_info.ieee self.current_settings.node_info.ieee == self.chosen_backup.node_info.ieee
or not self.current_settings.network_info.metadata["ezsp"][ or metadata["can_rewrite_custom_eui64"]
"can_write_custom_eui64" or not metadata["can_burn_userdata_custom_eui64"]
]
): ):
# No point in prompting the user if the backup doesn't have a new IEEE # No point in prompting the user if the backup doesn't have a new IEEE
# address or if there is no way to overwrite the IEEE address a second time # address or if there is no way to overwrite the IEEE address a second time

8
requirements_all.txt
View File

@ -497,7 +497,7 @@ beautifulsoup4==4.11.1
# beewi-smartclim==0.0.10 # beewi-smartclim==0.0.10
# homeassistant.components.zha # homeassistant.components.zha
bellows==0.35.5 bellows==0.35.6
# homeassistant.components.bmw_connected_drive # homeassistant.components.bmw_connected_drive
bimmer-connected==0.13.7 bimmer-connected==0.13.7
@ -2753,16 +2753,16 @@ ziggo-mediabox-xl==1.1.0
zigpy-deconz==0.21.0 zigpy-deconz==0.21.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-xbee==0.18.0 zigpy-xbee==0.18.1
# homeassistant.components.zha # homeassistant.components.zha
zigpy-zigate==0.11.0 zigpy-zigate==0.11.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-znp==0.11.1 zigpy-znp==0.11.2
# homeassistant.components.zha # homeassistant.components.zha
zigpy==0.56.0 zigpy==0.56.1
# homeassistant.components.zoneminder # homeassistant.components.zoneminder
zm-py==0.5.2 zm-py==0.5.2

8
requirements_test_all.txt
View File

@ -418,7 +418,7 @@ base36==0.1.1
beautifulsoup4==4.11.1 beautifulsoup4==4.11.1
# homeassistant.components.zha # homeassistant.components.zha
bellows==0.35.5 bellows==0.35.6
# homeassistant.components.bmw_connected_drive # homeassistant.components.bmw_connected_drive
bimmer-connected==0.13.7 bimmer-connected==0.13.7
@ -2017,16 +2017,16 @@ zha-quirks==0.0.101
zigpy-deconz==0.21.0 zigpy-deconz==0.21.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-xbee==0.18.0 zigpy-xbee==0.18.1
# homeassistant.components.zha # homeassistant.components.zha
zigpy-zigate==0.11.0 zigpy-zigate==0.11.0
# homeassistant.components.zha # homeassistant.components.zha
zigpy-znp==0.11.1 zigpy-znp==0.11.2
# homeassistant.components.zha # homeassistant.components.zha
zigpy==0.56.0 zigpy==0.56.1
# homeassistant.components.zwave_js # homeassistant.components.zwave_js
zwave-js-server-python==0.49.0 zwave-js-server-python==0.49.0

7
tests/components/zha/test_config_flow.py
View File

@ -74,6 +74,12 @@ def mock_app():
mock_app = AsyncMock() mock_app = AsyncMock()
mock_app.backups = create_autospec(BackupManager, instance=True) mock_app.backups = create_autospec(BackupManager, instance=True)
mock_app.backups.backups = [] mock_app.backups.backups = []
mock_app.state.network_info.metadata = {
"ezsp": {
"can_burn_userdata_custom_eui64": True,
"can_rewrite_custom_eui64": False,
}
}
with patch( with patch(
"zigpy.application.ControllerApplication.new", AsyncMock(return_value=mock_app) "zigpy.application.ControllerApplication.new", AsyncMock(return_value=mock_app)
@ -1517,6 +1523,7 @@ async def test_ezsp_restore_without_settings_change_ieee(
mock_app.state.node_info = backup.node_info mock_app.state.node_info = backup.node_info
mock_app.state.network_info = copy.deepcopy(backup.network_info) mock_app.state.network_info = copy.deepcopy(backup.network_info)
mock_app.state.network_info.network_key.tx_counter += 10000 mock_app.state.network_info.network_key.tx_counter += 10000
mock_app.state.network_info.metadata["ezsp"] = {}
# Include the overwrite option, just in case someone uploads a backup with it # Include the overwrite option, just in case someone uploads a backup with it
backup.network_info.metadata["ezsp"] = {EZSP_OVERWRITE_EUI64: True} backup.network_info.metadata["ezsp"] = {EZSP_OVERWRITE_EUI64: True}