From c7c78252f2e01e0342ce7e19ddd8d085bbbc8d60 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Sun, 12 May 2024 00:41:24 -0400 Subject: [PATCH 1/3] Bump zwave-js-server-python to 0.56.0 --- homeassistant/components/zwave_js/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json index 83a139331bb892..ee19f8c746db6e 100644 --- a/homeassistant/components/zwave_js/manifest.json +++ b/homeassistant/components/zwave_js/manifest.json @@ -9,7 +9,7 @@ "iot_class": "local_push", "loggers": ["zwave_js_server"], "quality_scale": "platinum", - "requirements": ["pyserial==3.5", "zwave-js-server-python==0.55.4"], + "requirements": ["pyserial==3.5", "zwave-js-server-python==0.56.0"], "usb": [ { "vid": "0658", diff --git a/requirements_all.txt b/requirements_all.txt index cc1086af91b6a4..cfbf48019d34ef 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2971,7 +2971,7 @@ zigpy==0.64.0 zm-py==0.5.4 # homeassistant.components.zwave_js -zwave-js-server-python==0.55.4 +zwave-js-server-python==0.56.0 # homeassistant.components.zwave_me zwave-me-ws==0.4.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 1eadfc85ab2249..fb4f05b0933707 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -2309,7 +2309,7 @@ zigpy-znp==0.12.1 zigpy==0.64.0 # homeassistant.components.zwave_js -zwave-js-server-python==0.55.4 +zwave-js-server-python==0.56.0 # homeassistant.components.zwave_me zwave-me-ws==0.4.3 From 8756218ef77e23f72ecfa68863b807eb0422ab7c Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Sun, 12 May 2024 02:01:06 -0400 Subject: [PATCH 2/3] Fix deprecation warning --- tests/components/zwave_js/test_api.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py index 6295dbed8f1421..5b1683454ceed9 100644 --- a/tests/components/zwave_js/test_api.py +++ b/tests/components/zwave_js/test_api.py @@ -2,6 +2,7 @@ from copy import deepcopy from http import HTTPStatus +from io import BytesIO import json from typing import Any from unittest.mock import patch @@ -3089,7 +3090,9 @@ async def test_firmware_upload_view( f"/api/zwave_js/firmware/upload/{device.id}", data=data ) - update_data = NodeFirmwareUpdateData("file", bytes(10)) + update_data = NodeFirmwareUpdateData( + "file", b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + ) for attr, value in expected_data.items(): setattr(update_data, attr, value) @@ -3129,7 +3132,9 @@ async def test_firmware_upload_view_controller( ) mock_node_cmd.assert_not_called() assert mock_controller_cmd.call_args[0][1:2] == ( - ControllerFirmwareUpdateData("file", bytes(10)), + ControllerFirmwareUpdateData( + "file", b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + ), ) assert mock_controller_cmd.call_args[1] == { "additional_user_agent_components": {"HomeAssistant": "0.0.0"}, @@ -3166,7 +3171,7 @@ async def test_firmware_upload_view_invalid_payload( client = await hass_client() resp = await client.post( f"/api/zwave_js/firmware/upload/{device.id}", - data={"wrong_key": bytes(10)}, + data={"wrong_key": BytesIO(bytes(10))}, ) assert resp.status == HTTPStatus.BAD_REQUEST @@ -3184,7 +3189,7 @@ async def test_firmware_upload_view_no_driver( aiohttp_client = await hass_client() resp = await aiohttp_client.post( f"/api/zwave_js/firmware/upload/{device.id}", - data={"wrong_key": bytes(10)}, + data={"wrong_key": BytesIO(bytes(10))}, ) assert resp.status == HTTPStatus.NOT_FOUND From 16b9cd416cde10d2d903da4331aac02028e54c85 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 12 May 2024 19:52:43 +0000 Subject: [PATCH 3/3] Fix tests --- tests/components/zwave_js/test_api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py index 5b1683454ceed9..ba2da45219ab21 100644 --- a/tests/components/zwave_js/test_api.py +++ b/tests/components/zwave_js/test_api.py @@ -1336,6 +1336,7 @@ async def test_get_provisioning_entries( "security_classes": [SecurityClass.S2_UNAUTHENTICATED], "requested_security_classes": None, "status": 0, + "protocol": None, "additional_properties": {"fake": "test"}, } ] @@ -1422,6 +1423,7 @@ async def test_parse_qr_code_string( "manufacturer_id": 1, "product_type": 1, "product_id": 1, + "protocol": None, "application_version": "test", "max_inclusion_request_interval": 1, "uuid": "test",