Pin python 3.13.0 and update ruff. (#2487)

Author: janiversen

.github/workflows/ci.yml

@@ -36,11 +36,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.9', '3.10', '3.11', '3.12', "3.13"]
+        python: ['3.9', '3.10', '3.11', '3.12', "3.13.0"]
         include:
           - python: '3.9'
             run_lint: true
-          - python: '3.13'
+          - python: '3.13.0'
             run_doc: true
             run_lint: true
           - os: macos-latest

examples/message_parser.py

@@ -93,40 +93,22 @@ def check_errors(self, decoder, message):
     def report(self, message):
         """Print the message information."""
         print(
-            "%-15s = %s"  # pylint: disable=consider-using-f-string
-            % (
-                "name",
-                message.__class__.__name__,
-            )
+            f"{'name':.15s} = {message.__class__.__name__}"
         )
         for k_dict, v_dict in message.__dict__.items():
             if isinstance(v_dict, dict):
-                print("%-15s =" % k_dict)  # pylint: disable=consider-using-f-string
+                print(f"{k_dict:.15s} =")
                 for k_item, v_item in v_dict.items():
-                    print(
-                        "  %-12s => %s"  # pylint: disable=consider-using-f-string
-                        % (k_item, v_item)
+                    print(f"  {k_item:.12s} => {v_item}"
                     )
             elif isinstance(v_dict, collections.abc.Iterable):
-                print("%-15s =" % k_dict)  # pylint: disable=consider-using-f-string
+                print(f"{k_dict:.15s} =")
                 value = str([int(x) for x in v_dict])
                 for line in textwrap.wrap(value, 60):
-                    print(
-                        "%-15s . %s"  # pylint: disable=consider-using-f-string
-                        % ("", line)
-                    )
+                    print(f"{' ':.15s} . {line}")
             else:
-                print(
-                    "%-15s = %s"  # pylint: disable=consider-using-f-string
-                    % (k_dict, hex(v_dict))
-                )
-        print(
-            "%-15s = %s"  # pylint: disable=consider-using-f-string
-            % (
-                "documentation",
-                message.__doc__,
-            )
-        )
+                print(f"{k_dict:.15s} = {hex(v_dict)}")
+        print("{'documentation':.15s} = {message.__doc__}")
 
 
 # -------------------------------------------------------------------------- #

pymodbus/__init__.py

@@ -7,9 +7,9 @@
     "ExceptionResponse",
     "FramerType",
     "ModbusException",
-    "pymodbus_apply_logging_config",
     "__version__",
     "__version_full__",
+    "pymodbus_apply_logging_config",
 ]
 
 from pymodbus.exceptions import ModbusException

pymodbus/datastore/__init__.py

@@ -3,10 +3,10 @@
 __all__ = [
     "ModbusBaseSlaveContext",
     "ModbusSequentialDataBlock",
-    "ModbusSparseDataBlock",
-    "ModbusSlaveContext",
     "ModbusServerContext",
     "ModbusSimulatorContext",
+    "ModbusSlaveContext",
+    "ModbusSparseDataBlock",
 ]
 
 from pymodbus.datastore.context import (

pymodbus/datastore/simulator.py

@@ -542,7 +542,7 @@ def loop_validate(self, address, end_address, fx_write):
         i = address
         while i < end_address:
             reg = self.registers[i]
-            if fx_write and not reg.access or reg.type == CellType.INVALID:
+            if (fx_write and not reg.access) or reg.type == CellType.INVALID:
                 return False
             if not self.type_exception:
                 i += 1

pymodbus/device.py

@@ -8,9 +8,9 @@
 
 
 __all__ = [
-    "ModbusPlusStatistics",
-    "ModbusDeviceIdentification",
     "DeviceInformationFactory",
+    "ModbusDeviceIdentification",
+    "ModbusPlusStatistics",
 ]
 
 import struct

pymodbus/exceptions.py

@@ -4,13 +4,13 @@
 """
 
 __all__ = [
-    "ModbusIOException",
-    "ParameterException",
-    "NotImplementedException",
     "ConnectionException",
-    "NoSuchSlaveException",
     "InvalidMessageReceivedException",
     "MessageRegisterException",
+    "ModbusIOException",
+    "NoSuchSlaveException",
+    "NotImplementedException",
+    "ParameterException",
 ]
 
 

pymodbus/framer/__init__.py

@@ -1,11 +1,11 @@
 """Framer."""
 __all__ = [
-    "FramerBase",
-    "FramerType",
     "FramerAscii",
+    "FramerBase",
     "FramerRTU",
     "FramerSocket",
-    "FramerTLS"
+    "FramerTLS",
+    "FramerType"
 ]
 
 from pymodbus.framer.ascii import FramerAscii

pymodbus/server/__init__.py

@@ -4,7 +4,6 @@
 """
 
 __all__ = [
-    "get_simulator_commandline",
     "ModbusSerialServer",
     "ModbusSimulatorServer",
     "ModbusTcpServer",
@@ -20,6 +19,7 @@
     "StartTcpServer",
     "StartTlsServer",
     "StartUdpServer",
+    "get_simulator_commandline",
 ]
 
 from pymodbus.server.async_io import (

pymodbus/transport/__init__.py

@@ -1,9 +1,9 @@
 """Transport."""
 __all__ = [
+    "NULLMODEM_HOST",
     "CommParams",
     "CommType",
     "ModbusProtocol",
-    "NULLMODEM_HOST",
 ]
 
 from pymodbus.transport.transport import (