diff --git a/homeassistant/components/zwave_js/cover.py b/homeassistant/components/zwave_js/cover.py index 7fceaf64c0e..9060e13a9a5 100644 --- a/homeassistant/components/zwave_js/cover.py +++ b/homeassistant/components/zwave_js/cover.py @@ -5,7 +5,7 @@ import logging from typing import Any from zwave_js_server.client import Client as ZwaveClient -from zwave_js_server.const.command_class.barrior_operator import BarrierState +from zwave_js_server.const.command_class.barrier_operator import BarrierState from zwave_js_server.model.value import Value as ZwaveValue from homeassistant.components.cover import ( diff --git a/homeassistant/components/zwave_js/discovery_data_template.py b/homeassistant/components/zwave_js/discovery_data_template.py index 23482bd33fe..f294294625a 100644 --- a/homeassistant/components/zwave_js/discovery_data_template.py +++ b/homeassistant/components/zwave_js/discovery_data_template.py @@ -32,8 +32,8 @@ from zwave_js_server.const.command_class.multilevel_sensor import ( ) from zwave_js_server.model.node import Node as ZwaveNode from zwave_js_server.model.value import Value as ZwaveValue, get_value_id -from zwave_js_server.util.command_class import ( - get_meter_scale_type, +from zwave_js_server.util.command_class.meter import get_meter_scale_type +from zwave_js_server.util.command_class.multilevel_sensor import ( get_multilevel_sensor_type, ) diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json index ad8ec22befb..c7b2b35837b 100644 --- a/homeassistant/components/zwave_js/manifest.json +++ b/homeassistant/components/zwave_js/manifest.json @@ -3,7 +3,7 @@ "name": "Z-Wave JS", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/zwave_js", - "requirements": ["zwave-js-server-python==0.29.1"], + "requirements": ["zwave-js-server-python==0.30.0"], "codeowners": ["@home-assistant/z-wave"], "dependencies": ["usb", "http", "websocket_api"], "iot_class": "local_push", diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py index 09d44f7f24a..6532da8a5e0 100644 --- a/homeassistant/components/zwave_js/sensor.py +++ b/homeassistant/components/zwave_js/sensor.py @@ -15,7 +15,7 @@ from zwave_js_server.const.command_class.meter import ( ) from zwave_js_server.model.node import Node as ZwaveNode from zwave_js_server.model.value import ConfigurationValue -from zwave_js_server.util.command_class import get_meter_type +from zwave_js_server.util.command_class.meter import get_meter_type from homeassistant.components.sensor import ( DEVICE_CLASS_ENERGY, diff --git a/homeassistant/components/zwave_js/switch.py b/homeassistant/components/zwave_js/switch.py index bd86a3b8377..44aa3a5566f 100644 --- a/homeassistant/components/zwave_js/switch.py +++ b/homeassistant/components/zwave_js/switch.py @@ -5,7 +5,7 @@ import logging from typing import Any from zwave_js_server.client import Client as ZwaveClient -from zwave_js_server.const.command_class.barrior_operator import ( +from zwave_js_server.const.command_class.barrier_operator import ( BarrierEventSignalingSubsystemState, ) diff --git a/requirements_all.txt b/requirements_all.txt index b147c53736c..7fa52e65976 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2486,4 +2486,4 @@ zigpy==0.37.1 zm-py==0.5.2 # homeassistant.components.zwave_js -zwave-js-server-python==0.29.1 +zwave-js-server-python==0.30.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 838507e157c..2266c9a0a6e 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1397,4 +1397,4 @@ zigpy-znp==0.5.4 zigpy==0.37.1 # homeassistant.components.zwave_js -zwave-js-server-python==0.29.1 +zwave-js-server-python==0.30.0 diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py index ee05724a9cb..b3bb924413d 100644 --- a/tests/components/zwave_js/test_api.py +++ b/tests/components/zwave_js/test_api.py @@ -338,7 +338,7 @@ async def test_add_node_secure( assert len(client.async_send_command.call_args_list) == 1 assert client.async_send_command.call_args[0][0] == { "command": "controller.begin_inclusion", - "options": {"inclusionStrategy": InclusionStrategy.SECURITY_S0}, + "options": {"strategy": InclusionStrategy.SECURITY_S0}, } client.async_send_command.reset_mock() @@ -363,7 +363,7 @@ async def test_add_node( assert len(client.async_send_command.call_args_list) == 1 assert client.async_send_command.call_args[0][0] == { "command": "controller.begin_inclusion", - "options": {"inclusionStrategy": InclusionStrategy.INSECURE}, + "options": {"strategy": InclusionStrategy.INSECURE}, } event = Event( @@ -671,7 +671,7 @@ async def test_replace_failed_node_secure( assert client.async_send_command.call_args[0][0] == { "command": "controller.replace_failed_node", "nodeId": nortek_thermostat.node_id, - "options": {"inclusionStrategy": InclusionStrategy.SECURITY_S0}, + "options": {"strategy": InclusionStrategy.SECURITY_S0}, } client.async_send_command.reset_mock() @@ -720,7 +720,7 @@ async def test_replace_failed_node( assert client.async_send_command.call_args[0][0] == { "command": "controller.replace_failed_node", "nodeId": nortek_thermostat.node_id, - "options": {"inclusionStrategy": InclusionStrategy.INSECURE}, + "options": {"strategy": InclusionStrategy.INSECURE}, } client.async_send_command.reset_mock()