Merge branch 'dev'

Author: janiversen

.github/workflows/ci.yml

@@ -50,7 +50,6 @@ jobs:
         uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python }}
-          allow-prereleases: true
           enable-cache: true
 
       - name: Create virtualenv and sync dependencies

AUTHORS.rst

@@ -43,6 +43,7 @@ Thanks to
 - Dries
 - duc996
 - efdx
+- embedded-bed
 - Erlend E. Aasland
 - Esco441-91
 - Farzad Panahi

CHANGELOG.rst

@@ -7,6 +7,34 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+
+Version 3.11.2
+--------------
+* Clarify documentation on reconnect_delay (#2769)
+* Solve CI complaints. (#2766)
+* Coverage not allowed below 99.5%. (#2765)
+* Test coverage global 100%. (#2764)
+* Test coverage simulator 100%. (#2763)
+* Test coverage server 100%. (#2760)
+* Fix python3.14 deprecation. (#2759)
+* Test coverage datastore 100%. (#2757)
+* Context test failed due to function code overwritten. (#2758)
+* Test coverage transaction 100%. (#2756)
+* Test coverage pdu 100%. (#2755)
+* Framer test 100%. (#2754)
+* llow sub_function_code is custom PDU. (#2753)
+* Generate pdu table direct. (#2752)
+* Clean pdu lookup in simulator. (#2751)
+* diag sub_function_code is 2 bytes. (#2750)
+* Requesthandler ignore missing devices logging (#2749)
+* Simplify pdu lookup. (#2745)
+* Missing coma in string representation of ModbusPDU (#2748)
+* Correct "install uv". (#2744)
+* Suppress aiohttp missing. (#2743)
+* Remove garbage bytes in serial comm. (#2741)
+* Test now included python 3.14.
+* Stricter types with pyright (#2731)
+
 Version 3.11.1
 --------------
 * Auto debug in case of an error. (#2738)

README.rst

@@ -35,7 +35,7 @@ as well as the
 `API_changes <https://github.com/pymodbus-dev/pymodbus/blob/dev/API_changes.rst>`_
 files.
 
-Current release is `3.11.1 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.11.1>`_.
+Current release is `3.11.2 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.11.2>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 
@@ -69,7 +69,7 @@ Common features
 * Very lightweight project
 * Requires Python >= 3.10
 * Thorough test suite, that test all corners of the library
-* Automatically tested on Windows, Linux and MacOS combined with python 3.10 - 3.13
+* Automatically tested on Windows, Linux and MacOS combined with python 3.10 - 3.14
 * Strongly typed API (py.typed present)
 
 The modbus protocol specification: Modbus_Application_Protocol_V1_1b3.pdf can be found on

doc/source/_static/examples.tgz

@@ -8,6 +8,7 @@
 
 import asyncio
 import logging
+import sys
 
 from pymodbus import FramerType, pymodbus_apply_logging_config
 from pymodbus.datastore import (
@@ -19,6 +20,15 @@
 from pymodbus.server import ModbusTcpServer
 
 
+try:
+    import helper  # type: ignore[import-not-found]
+except ImportError:
+    print("*** ERROR --> THIS EXAMPLE needs the example directory, please see \n\
+          https://pymodbus.readthedocs.io/en/latest/source/examples.html\n\
+          for more information.")
+    sys.exit(-1)
+
+
 class Manipulator:
     """A Class to run the server."""
 
@@ -43,8 +53,9 @@ def trace_connect(self, connect: bool) -> None:
         txt = "Connected" if connect else "Disconnected"
         print(f"---> {txt}")
 
-    async def setup(self):
+    async def setup(self, cmdline):
         """Prepare server."""
+        args = helper.get_commandline(server=True, description="server hooks", cmdline=cmdline)
         pymodbus_apply_logging_config(logging.DEBUG)
         datablock = ModbusSequentialDataBlock(0x00, [17] * 100)
         context = ModbusServerContext(
@@ -53,11 +64,12 @@ async def setup(self):
             ),
             single=True,
         )
+        address: tuple[str, int] = (args.host if args.host else "", args.port if args.port else 0)
         self.server = ModbusTcpServer(
             context,
             framer=FramerType.SOCKET,
             identity=None,
-            address=("127.0.0.1", 5020),
+            address=address,
             trace_packet=self.trace_packet,
             trace_pdu=self.trace_pdu,
             trace_connect=self.trace_connect,
@@ -68,10 +80,10 @@ async def run(self):
         await self.server.serve_forever()
 
 
-async def main():
+async def main(cmdline=None):
     """Run example."""
     server = Manipulator()
-    await server.setup()
+    await server.setup(cmdline=cmdline)
     await server.run()
 
 

doc/source/_static/examples.zip

@@ -63,15 +63,15 @@ async def updating_task(context):
     It should be noted that getValues and setValues are not safe
     against concurrent use.
     """
-    fc_as_hex = 3
+    func_code = 3
     device_id = 0x00
     address = 0x10
     count = 6
 
     # set values to zero
-    values = context[device_id].getValues(fc_as_hex, address, count=count)
+    values = context[device_id].getValues(func_code, address, count=count)
     values = [0 for v in values]
-    context[device_id].setValues(fc_as_hex, address, values)
+    context[device_id].setValues(func_code, address, values)
 
     txt = (
         f"updating_task: started: initialised values: {values!s} at address {address!s}"
@@ -83,9 +83,9 @@ async def updating_task(context):
     while True:
         await asyncio.sleep(2)
 
-        values = context[device_id].getValues(fc_as_hex, address, count=count)
+        values = context[device_id].getValues(func_code, address, count=count)
         values = [v + 1 for v in values]
-        context[device_id].setValues(fc_as_hex, address, values)
+        context[device_id].setValues(func_code, address, values)
 
         txt = f"updating_task: incremented values: {values!s} at address {address!s}"
         print(txt)

examples/server_hook.py

@@ -20,5 +20,5 @@
 from pymodbus.pdu.device import ModbusDeviceIdentification
 
 
-__version__ = "3.11.1"
+__version__ = "3.11.2"
 __version_full__ = f"[pymodbus, version {__version__}]"

examples/server_updating.py

@@ -35,9 +35,9 @@ class AsyncModbusSerialClient(ModbusBaseClient):
     :param stopbits: Number of stop bits 1, 1.5, 2.
     :param handle_local_echo: Discard local echo from dongle.
     :param name: Set communication name, used in logging
-    :param reconnect_delay: Minimum delay in seconds.milliseconds before reconnecting.
-    :param reconnect_delay_max: Maximum delay in seconds.milliseconds before reconnecting.
-    :param timeout: Timeout for connecting and receiving data, in seconds.
+    :param reconnect_delay: Minimum delay when reconnecting, in seconds (use decimals for milliseconds).
+    :param reconnect_delay_max: Maximum delay when reconnecting, in seconds (use decimals for milliseconds).
+    :param timeout: Timeout for connecting and receiving data, in seconds (use decimals for milliseconds).
     :param retries: Max number of retries per request.
     :param trace_packet: Called with bytestream received/to be sent
     :param trace_pdu: Called with PDU received/to be sent