Skip to content

Bump ZHA dependencies #95478

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.

Sign up for GitHub

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

Merged
balloob merged 2 commits into from
Jun 28, 2023
Merged

Bump ZHA dependencies #95478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa12bf6
Bump ZHA dependencies
puddly Jun 28, 2023
fd9eba8
Account for new EZSP metadata keys
puddly Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions homeassistant/components/zha/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"zigpy_znp"
],
"requirements": [
"bellows==0.35.5",
"bellows==0.35.6",
"pyserial==3.5",
"pyserial-asyncio==0.6",
"zha-quirks==0.0.101",
"zigpy-deconz==0.21.0",
"zigpy==0.56.0",
"zigpy-xbee==0.18.0",
"zigpy==0.56.1",
"zigpy-xbee==0.18.1",
"zigpy-zigate==0.11.0",
"zigpy-znp==0.11.1"
"zigpy-znp==0.11.2"
],
"usb": [
{
Expand Down
7 changes: 4 additions & 3 deletions homeassistant/components/zha/radio_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,12 @@ async def async_restore_backup_step_1(self) -> bool:

assert self.current_settings is not None

metadata = self.current_settings.network_info.metadata["ezsp"]

if (
self.current_settings.node_info.ieee == self.chosen_backup.node_info.ieee
or not self.current_settings.network_info.metadata["ezsp"][
"can_write_custom_eui64"
]
or metadata["can_rewrite_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
# address or if there is no way to overwrite the IEEE address a second time
Expand Down
8 changes: 4 additions & 4 deletions requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ beautifulsoup4==4.11.1
# beewi-smartclim==0.0.10

# homeassistant.components.zha
bellows==0.35.5
bellows==0.35.6

# homeassistant.components.bmw_connected_drive
bimmer-connected==0.13.7
Expand Down Expand Up @@ -2753,16 +2753,16 @@ ziggo-mediabox-xl==1.1.0
zigpy-deconz==0.21.0

# homeassistant.components.zha
zigpy-xbee==0.18.0
zigpy-xbee==0.18.1

# homeassistant.components.zha
zigpy-zigate==0.11.0

# homeassistant.components.zha
zigpy-znp==0.11.1
zigpy-znp==0.11.2

# homeassistant.components.zha
zigpy==0.56.0
zigpy==0.56.1

# homeassistant.components.zoneminder
zm-py==0.5.2
Expand Down
8 changes: 4 additions & 4 deletions requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ base36==0.1.1
beautifulsoup4==4.11.1

# homeassistant.components.zha
bellows==0.35.5
bellows==0.35.6

# homeassistant.components.bmw_connected_drive
bimmer-connected==0.13.7
Expand Down Expand Up @@ -2017,16 +2017,16 @@ zha-quirks==0.0.101
zigpy-deconz==0.21.0

# homeassistant.components.zha
zigpy-xbee==0.18.0
zigpy-xbee==0.18.1

# homeassistant.components.zha
zigpy-zigate==0.11.0

# homeassistant.components.zha
zigpy-znp==0.11.1
zigpy-znp==0.11.2

# homeassistant.components.zha
zigpy==0.56.0
zigpy==0.56.1

# homeassistant.components.zwave_js
zwave-js-server-python==0.49.0
Expand Down
7 changes: 7 additions & 0 deletions tests/components/zha/test_config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ def mock_app():
mock_app = AsyncMock()
mock_app.backups = create_autospec(BackupManager, instance=True)
mock_app.backups.backups = []
mock_app.state.network_info.metadata = {
"ezsp": {
"can_burn_userdata_custom_eui64": True,
"can_rewrite_custom_eui64": False,
}
}

with patch(
"zigpy.application.ControllerApplication.new", AsyncMock(return_value=mock_app)
Expand Down Expand Up @@ -1517,6 +1523,7 @@ async def test_ezsp_restore_without_settings_change_ieee(
mock_app.state.node_info = backup.node_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.metadata["ezsp"] = {}

# Include the overwrite option, just in case someone uploads a backup with it
backup.network_info.metadata["ezsp"] = {EZSP_OVERWRITE_EUI64: True}
Expand Down