From d50b993f64f057cd856c995388c4adcb3d2cad44 Mon Sep 17 00:00:00 2001 From: jan iversen Date: Thu, 3 Aug 2023 13:34:20 +0200 Subject: [PATCH] Bump pymodbus v3.4.1. (#97612) * Bump pymodbus v3.4.1. * Solve mypy problem. --- homeassistant/components/modbus/manifest.json | 2 +- homeassistant/components/modbus/modbus.py | 2 -- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/modbus/manifest.json b/homeassistant/components/modbus/manifest.json index c2e6b9ef467..d0d573227d8 100644 --- a/homeassistant/components/modbus/manifest.json +++ b/homeassistant/components/modbus/manifest.json @@ -6,5 +6,5 @@ "iot_class": "local_polling", "loggers": ["pymodbus"], "quality_scale": "gold", - "requirements": ["pymodbus==3.3.1"] + "requirements": ["pymodbus==3.4.1"] } diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py index cb3501f3375..dd32e74cdbd 100644 --- a/homeassistant/components/modbus/modbus.py +++ b/homeassistant/components/modbus/modbus.py @@ -13,7 +13,6 @@ from pymodbus.client import ( ModbusTcpClient, ModbusUdpClient, ) -from pymodbus.constants import Defaults from pymodbus.exceptions import ModbusException from pymodbus.pdu import ModbusResponse from pymodbus.transaction import ModbusAsciiFramer, ModbusRtuFramer, ModbusSocketFramer @@ -301,7 +300,6 @@ class ModbusHub: else: self._pb_params["framer"] = ModbusSocketFramer - Defaults.Timeout = client_config[CONF_TIMEOUT] if CONF_MSG_WAIT in client_config: self._msg_wait = client_config[CONF_MSG_WAIT] / 1000 elif self._config_type == SERIAL: diff --git a/requirements_all.txt b/requirements_all.txt index c597a235392..0a09f288d2c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1842,7 +1842,7 @@ pymitv==1.4.3 pymochad==0.2.0 # homeassistant.components.modbus -pymodbus==3.3.1 +pymodbus==3.4.1 # homeassistant.components.monoprice pymonoprice==0.4 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index a28f8f48752..f0c4c1fece6 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1364,7 +1364,7 @@ pymeteoclimatic==0.0.6 pymochad==0.2.0 # homeassistant.components.modbus -pymodbus==3.3.1 +pymodbus==3.4.1 # homeassistant.components.monoprice pymonoprice==0.4