Update dependency pymodbus to >=3.0.2,<3.6.0

.github/workflows/python-package.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        pymodbus-version: ["2.5.3", "3.0.2", "3.1.3", "3.2.2", "3.3.1", "3.4.1"]
+        pymodbus-version: ["2.5.3", "3.0.2", "3.1.3", "3.2.2", "3.3.1", "3.4.1", "3.5.0"]
         exclude:
         - python-version: "3.10"
           pymodbus-version: "2.5.3"

productivity/driver.py

@@ -149,8 +149,10 @@ async def _write_register_value(self, key: str,
 
         """
         start_address = self.tags[key]['address']['start'] - 400001
-        builder = BinaryPayloadBuilder(byteorder=Endian.Big,
-                                       wordorder=Endian.Little)
+        bigendian = Endian.BIG if self.pymodbus35plus else Endian.Big  # type:ignore[attr-defined]
+        lilendian = Endian.LITTLE if self.pymodbus35plus else Endian.Little  # type:ignore
+        builder = BinaryPayloadBuilder(byteorder=bigendian,
+                                       wordorder=lilendian)
         data_type = self.tags[key]['type']
         if data_type == 'float':
             builder.add_32bit_float(float(value))
@@ -222,9 +224,11 @@ async def _read_discrete(self, addresses: dict, output=True) -> dict:
     async def _read_registers(self, a_type: str) -> dict:
         """Handle reading input or holding registers from the PLC."""
         r = await self.read_registers(**self.addresses[a_type], type=a_type)
+        bigendian = Endian.BIG if self.pymodbus35plus else Endian.Big  # type:ignore[attr-defined]
+        lilendian = Endian.LITTLE if self.pymodbus35plus else Endian.Little  # type:ignore
         decoder = BinaryPayloadDecoder.fromRegisters(r,
-                                                     byteorder=Endian.Big,
-                                                     wordorder=Endian.Little)
+                                                     byteorder=bigendian,
+                                                     wordorder=lilendian)
         current = self.addresses[a_type]['address'] + TYPE_START[a_type] + 1
         end = current + self.addresses[a_type]['count']
         result = {}

productivity/util.py

@@ -71,6 +71,7 @@ def _detect_pymodbus_version(self) -> None:
         self.pymodbus30plus = int(pymodbus.__version__[0]) == 3
         self.pymodbus32plus = self.pymodbus30plus and int(pymodbus.__version__[2]) >= 2
         self.pymodbus33plus = self.pymodbus30plus and int(pymodbus.__version__[2]) >= 3
+        self.pymodbus35plus = self.pymodbus30plus and int(pymodbus.__version__[2]) >= 5
 
     async def _connect(self):
         """Start asynchronous reconnect loop."""

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='productivity',
-    version='0.10.0',
+    version='0.10.1',
     description="Python driver for AutomationDirect Productivity Series PLCs.",
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -22,7 +22,7 @@
     install_requires=[
         'pymodbus>=2.4.0; python_version == "3.8"',
         'pymodbus>=2.4.0; python_version == "3.9"',
-        'pymodbus>=3.0.2,<3.5.0; python_version >= "3.10"',
+        'pymodbus>=3.0.2,<3.6.0; python_version >= "3.10"',
         'PyYAML',
     ],
     extras_require={