Update to pymodbus v3.0.0 (#143)

* Pin to latest dev version of pymodbus

* Update requirements.txt

* Revert "Update requirements.txt"

This reverts commit a6c4c23.

* Update requirements.txt

* Update requirements.txt

* Remove pymodbus.compat

* Revert "Update requirements.txt"

This reverts commit 8d3a280.

* Fix iter items

* Bump version for pre-release

* pymodbus dev5

* Update requirements.txt

* Update hub.py

* Bump pymodbus version

* Update imports and args for pymodbus

* Update hub.py

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/hub.py

@@ -4,8 +4,7 @@
 from typing import Any, Dict, Optional
 
 from homeassistant.core import HomeAssistant
-from pymodbus.client.sync import ModbusTcpClient
-from pymodbus.compat import iteritems
+from pymodbus.client import ModbusTcpClient
 from pymodbus.constants import Endian
 from pymodbus.exceptions import ConnectionException, ModbusIOException
 from pymodbus.payload import BinaryPayloadDecoder
@@ -402,7 +401,7 @@ async def shutdown(self) -> None:
     def read_holding_registers(self, unit, address, count):
         """Read holding registers."""
         with self._lock:
-            kwargs = {"unit": unit} if unit else {}
+            kwargs = {"slave": unit} if unit else {}
             return self._client.read_holding_registers(address, count, **kwargs)
 
 
@@ -452,7 +451,7 @@ def init_device(self) -> None:
             ]
         )
 
-        for name, value in iteritems(decoded_ident):
+        for name, value in iter(decoded_ident.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id}: "
@@ -499,7 +498,7 @@ def init_device(self) -> None:
             ]
         )
 
-        for name, value in iteritems(self.decoded_common):
+        for name, value in iter(self.decoded_common.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id}: "
@@ -541,7 +540,7 @@ def init_device(self) -> None:
                 ]
             )
 
-            for name, value in iteritems(self.decoded_mmppt):
+            for name, value in iter(self.decoded_mmppt.items()):
                 _LOGGER.debug(
                     (
                         f"Inverter {self.inverter_unit_id} MMPPT: "
@@ -599,7 +598,7 @@ def read_modbus_data(self) -> None:
             ]
         )
 
-        for name, value in iteritems(decoded_ident):
+        for name, value in iter(decoded_ident.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id}: "
@@ -736,7 +735,7 @@ def read_modbus_data(self) -> None:
                 )
                 self.advanced_power_control = True
 
-        for name, value in iteritems(self.decoded_model):
+        for name, value in iter(self.decoded_model.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id}: "
@@ -821,7 +820,7 @@ def init_device(self) -> None:
             ]
         )
 
-        for name, value in iteritems(decoded_ident):
+        for name, value in iter(decoded_ident.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
@@ -865,7 +864,7 @@ def init_device(self) -> None:
             ]
         )
 
-        for name, value in iteritems(self.decoded_common):
+        for name, value in iter(self.decoded_common.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
@@ -920,7 +919,7 @@ def read_modbus_data(self) -> None:
             ]
         )
 
-        for name, value in iteritems(decoded_ident):
+        for name, value in iter(decoded_ident.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
@@ -1028,7 +1027,7 @@ def read_modbus_data(self) -> None:
             ]
         )
 
-        for name, value in iteritems(self.decoded_model):
+        for name, value in iter(self.decoded_model.items()):
             _LOGGER.debug(
                 (
                     f"Inverter {self.inverter_unit_id} meter {self.meter_id}: "
@@ -1115,7 +1114,7 @@ def init_device(self) -> None:
             ]
         )
 
-        for name, value in iteritems(self.decoded_common):
+        for name, value in iter(self.decoded_common.items()):
             if isinstance(value, float):
                 _LOGGER.debug(
                     (
@@ -1221,7 +1220,7 @@ def read_modbus_data(self) -> None:
             ]
         )
 
-        for name, value in iteritems(self.decoded_model):
+        for name, value in iter(self.decoded_model.items()):
             if isinstance(value, float):
                 _LOGGER.debug(
                     (

custom_components/solaredge_modbus_multi/manifest.json

@@ -3,7 +3,7 @@
   "name": "SolarEdge Modbus Multi Device",
   "documentation": "https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki",
   "issue_tracker": "https://github.com/WillCodeForCats/solaredge-modbus-multi/issues",
-  "requirements": ["pymodbus==2.5.3"],
+  "requirements": ["pymodbus==3.0.0"],
   "dependencies": [],
   "codeowners": ["@WillCodeForCats"],
   "config_flow": true,

requirements.txt

@@ -1 +1 @@
-pymodbus == 2.5.3
+pymodbus==3.0.0