Upgrade pylint and ruff (#1989)

Author: alexrudd2

CONTRIBUTING.rst

@@ -2,5 +2,4 @@ Just fork the repo and raise your PR against `dev` branch.
 
 We always have more work than time, so feel free to open a discussion / issue on a theme you want to solve.
 
-For instructions please refer to README.rst, which details how to install a developmnet environment etc.
-
+For instructions please refer to README.rst, which details how to install a development environment etc.

pymodbus/datastore/remote.py

@@ -73,42 +73,42 @@ def __build_mapping(self):
         if self.slave:
             kwargs["slave"] = self.slave
         self.__get_callbacks = {
-            "d": lambda a, c: self._client.read_discrete_inputs(  # pylint: disable=unnecessary-lambda
+            "d": lambda a, c: self._client.read_discrete_inputs(
                 a, c, **kwargs
             ),
-            "c": lambda a, c: self._client.read_coils(  # pylint: disable=unnecessary-lambda
+            "c": lambda a, c: self._client.read_coils(
                 a, c, **kwargs
             ),
-            "h": lambda a, c: self._client.read_holding_registers(  # pylint: disable=unnecessary-lambda
+            "h": lambda a, c: self._client.read_holding_registers(
                 a, c, **kwargs
             ),
-            "i": lambda a, c: self._client.read_input_registers(  # pylint: disable=unnecessary-lambda
+            "i": lambda a, c: self._client.read_input_registers(
                 a, c, **kwargs
             ),
         }
         self.__set_callbacks = {
-            "d5": lambda a, v: self._client.write_coil(  # pylint: disable=unnecessary-lambda
+            "d5": lambda a, v: self._client.write_coil(
                 a, v, **kwargs
             ),
-            "d15": lambda a, v: self._client.write_coils(  # pylint: disable=unnecessary-lambda
+            "d15": lambda a, v: self._client.write_coils(
                 a, v, **kwargs
             ),
-            "c5": lambda a, v: self._client.write_coil(  # pylint: disable=unnecessary-lambda
+            "c5": lambda a, v: self._client.write_coil(
                 a, v, **kwargs
             ),
-            "c15": lambda a, v: self._client.write_coils(  # pylint: disable=unnecessary-lambda
+            "c15": lambda a, v: self._client.write_coils(
                 a, v, **kwargs
             ),
-            "h6": lambda a, v: self._client.write_register(  # pylint: disable=unnecessary-lambda
+            "h6": lambda a, v: self._client.write_register(
                 a, v, **kwargs
             ),
-            "h16": lambda a, v: self._client.write_registers(  # pylint: disable=unnecessary-lambda
+            "h16": lambda a, v: self._client.write_registers(
                 a, v, **kwargs
             ),
-            "i6": lambda a, v: self._client.write_register(  # pylint: disable=unnecessary-lambda
+            "i6": lambda a, v: self._client.write_register(
                 a, v, **kwargs
             ),
-            "i16": lambda a, v: self._client.write_registers(  # pylint: disable=unnecessary-lambda
+            "i16": lambda a, v: self._client.write_registers(
                 a, v, **kwargs
             ),
         }

pymodbus/device.py

@@ -113,7 +113,7 @@ def encode(self):
 
         :returns: 54 16-bit words representing the status
         """
-        total, values = [], sum(self.__data.values(), [])
+        total, values = [], sum(self.__data.values(), [])  # noqa: RUF017
         for i in range(0, len(values), 2):
             total.append((values[i] << 8) | values[i + 1])
         return total

pymodbus/transport/serialtransport.py

@@ -154,8 +154,8 @@ async def polling_task(self):
                     self.write_ready()
                 if self.sync_serial.in_waiting:
                     self._read_ready()
-        except asyncio.CancelledError:
-            self.close("Cancelled")
+        except asyncio.CancelledError as exc:
+            self.close(exc)
 
 
 async def create_serial_connection(

pyproject.toml

@@ -70,13 +70,13 @@ development = [
     "codespell>=2.2.2",
     "coverage>=7.4.0",
     "mypy>=1.6.0",
-    "pylint>=2.17.2",
+    "pylint>=3.0.0",
     "pytest>=7.3.1",
     "pytest-asyncio>=0.20.3",
     "pytest-cov>=4.1.0",
     "pytest-timeout>=2.2.0",
     "pytest-xdist>=3.3.1",
-    "ruff>=0.1.3",
+    "ruff>=0.2.0",
     "twine>=4.0.2",
     "types-Pygments",
     "types-pyserial"
@@ -300,10 +300,10 @@ select = [
 fixable = ["ALL"]
 unfixable = []
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "pep257"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 lines-after-imports = 2
 known-local-folder = []
 

test/conftest.py

@@ -18,7 +18,7 @@
 
 sys.path.extend(["examples", "../examples", "../../examples"])
 
-from examples.server_async import (  # noqa: E402  # pylint: disable=wrong-import-position
+from examples.server_async import (  # pylint: disable=wrong-import-position
     run_async_server,
     setup_server,
 )