Merge pull request #374 from furqan463/update_ruff

Update Ruff Rules (UP, RSE, TRY002, FBT003)

Author: figueroa1395

docs/examples/arrow_example.ipynb

@@ -26,7 +26,7 @@
    "outputs": [],
    "source": [
     "%%capture cap --no-stderr\n",
-    "from typing import Iterable\n",
+    "from collections.abc import Iterable\n",
     "\n",
     "import numpy as np\n",
     "import pandas as pd\n",
@@ -405,7 +405,7 @@
          "type": "float"
         }
        ],
-       "ref": "7fc39afa-a366-4a3b-baae-833f31d69d02",
+       "ref": "2548a4ee-832c-4467-a49b-f8d0aa1063f6",
        "rows": [
         [
          "0",
@@ -757,7 +757,7 @@
          "type": "float"
         }
        ],
-       "ref": "8823e105-4bd4-46fd-a1ff-ec1e5bc7687c",
+       "ref": "9e919d45-d97c-40e3-ad30-09cdfa54cfc7",
        "rows": [
         [
          "0",

docs/examples/pandapower_example.ipynb

@@ -198,7 +198,7 @@
    "source": [
     "import pandas as pd\n",
     "\n",
-    "pd.set_option(\"future.no_silent_downcasting\", True)  # enable behaviour of pandas 3.x\n",
+    "pd.options.future.no_silent_downcasting = True  # enable behaviour of pandas 3.x\n",
     "\n",
     "# The node data is stored as a numpy structured array in input_data[\"line\"]\n",
     "display(input_data[\"line\"])\n",
@@ -289,7 +289,7 @@
          "type": "float"
         }
        ],
-       "ref": "eb369e38-8d56-41bd-8cd4-b4d6d31658c2",
+       "ref": "bd00b4dd-df52-4856-8e90-68ddc1bd43a0",
        "rows": [
         [
          "0",
@@ -581,7 +581,7 @@
          "type": "float"
         }
        ],
-       "ref": "2fdfa403-0f5b-4b9b-8a82-1ffb5d04b66f",
+       "ref": "97050d7e-8f61-4286-9e9d-f49820257e46",
        "rows": [
         [
          "101",
@@ -764,7 +764,7 @@
          "type": "float"
         }
        ],
-       "ref": "eb0233ad-7351-415b-9904-766914e17821",
+       "ref": "d0a7d9d2-bf94-4ce4-b4b1-ac5dce7236b4",
        "rows": [
         [
          "101",
@@ -1003,7 +1003,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "2026-02-16 20:32:42 [warning  ] Zero sequence parameters given in trafo shall be ignored: vkr0_percent, si0_hv_partial\n"
+      "2026-02-19 05:18:47 [warning  ] Zero sequence parameters given in trafo shall be ignored: vkr0_percent, si0_hv_partial\n"
      ]
     }
    ],

pyproject.toml

@@ -152,17 +152,17 @@ select = [
     # self
     #"SLF",
     # pyupgrade
-    #"UP",
+    "UP",
     # raise
-    #"RSE",
+    "RSE",
     # ruff sepcific rules
     "RUF",
     # bandit
     #"S",
     # boolean positional value in call
-    #"FBT003",
+    "FBT003",
     # raise vanilla args
-    #"TRY002",
+    "TRY002",
     # pytest-style
     #"PT",
 ]
@@ -172,9 +172,6 @@ ignore = []
 # Imports that are imported using keyword "as" and are from the same source - are combined.
 combine-as-imports = true
 
-[tool.ruff.lint.per-file-ignores]
-"tests/**/*.py" = ["TID252"] # intentional relative imports inside tests
-
 [tool.mypy]
 follow_imports = "silent"
 ignore_missing_imports = true

src/power_grid_model_io/converters/base_converter.py

@@ -7,7 +7,6 @@
 
 import logging
 from abc import ABC, abstractmethod
-from typing import Generic, Optional, Tuple, TypeVar
 
 import structlog
 from power_grid_model import DatasetType
@@ -17,16 +16,14 @@
 from power_grid_model_io.data_types import ExtraInfo
 from power_grid_model_io.utils.auto_id import AutoID
 
-T = TypeVar("T")
 
-
-class BaseConverter(Generic[T], ABC):
+class BaseConverter[T](ABC):
     """Abstract converter class"""
 
     def __init__(
         self,
-        source: Optional[BaseDataStore[T]] = None,
-        destination: Optional[BaseDataStore[T]] = None,
+        source: BaseDataStore[T] | None = None,
+        destination: BaseDataStore[T] | None = None,
         log_level: int = logging.INFO,
     ):
         """
@@ -39,9 +36,7 @@ def __init__(
         self._destination = destination
         self._auto_id = AutoID()
 
-    def load_input_data(
-        self, data: Optional[T] = None, make_extra_info: bool = True
-    ) -> Tuple[SingleDataset, ExtraInfo]:
+    def load_input_data(self, data: T | None = None, make_extra_info: bool = True) -> tuple[SingleDataset, ExtraInfo]:
         """Load input data and extra info
 
         Note: You shouldn't have to overwrite this method. Check _parse_data() instead.
@@ -62,70 +57,70 @@ def load_input_data(
             raise TypeError("Input data can not be batch data")
         return parsed_data, extra_info
 
-    def load_update_data(self, data: Optional[T] = None) -> Dataset:
+    def load_update_data(self, data: T | None = None) -> Dataset:
         """Load update data
 
         Note: You shouldn't have to overwrite this method. Check _parse_data() instead.
 
         Args:
-          data: Optional[T]:  (Default value = None)
+          data: T | None:  (Default value = None)
 
         Returns:
 
         """
         data = self._load_data(data)
         return self._parse_data(data=data, data_type=DatasetType.update, extra_info=None)
 
-    def load_sym_output_data(self, data: Optional[T] = None) -> Dataset:
+    def load_sym_output_data(self, data: T | None = None) -> Dataset:
         """Load symmetric output data
 
         Note: You shouldn't have to overwrite this method. Check _parse_data() instead.
 
         Args:
-          data: Optional[T]:  (Default value = None)
+          data: T | None:  (Default value = None)
 
         Returns:
 
         """
         data = self._load_data(data)
         return self._parse_data(data=data, data_type=DatasetType.sym_output, extra_info=None)
 
-    def load_asym_output_data(self, data: Optional[T] = None) -> Dataset:
+    def load_asym_output_data(self, data: T | None = None) -> Dataset:
         """Load asymmetric output data
 
         Note: You shouldn't have to overwrite this method. Check _parse_data() instead.
 
         Args:
-          data: Optional[T]:  (Default value = None)
+          data: T | None:  (Default value = None)
 
         Returns:
 
         """
         data = self._load_data(data)
         return self._parse_data(data=data, data_type=DatasetType.asym_output, extra_info=None)
 
-    def load_sc_output_data(self, data: Optional[T] = None) -> Dataset:
+    def load_sc_output_data(self, data: T | None = None) -> Dataset:
         """Load sc output data
 
         Note: You shouldn't have to overwrite this method. Check _parse_data() instead.
 
         Args:
-          data: Optional[T]:  (Default value = None)
+          data: T | None:  (Default value = None)
 
         Returns:
 
         """
         data = self._load_data(data)
         return self._parse_data(data=data, data_type=DatasetType.sc_output, extra_info=None)
 
-    def convert(self, data: Dataset, extra_info: Optional[ExtraInfo] = None) -> T:
+    def convert(self, data: Dataset, extra_info: ExtraInfo | None = None) -> T:
         """Convert input/update/(a)sym_output data and optionally extra info.
 
         Note: You shouldn't have to overwrite this method. Check _serialize_data() instead.
 
         Args:
           data: Dataset:
-          extra_info: Optional[ExtraInfo]:  (Default value = None)
+          extra_info: ExtraInfo | None:  (Default value = None)
 
         Returns:
 
@@ -135,17 +130,17 @@ def convert(self, data: Dataset, extra_info: Optional[ExtraInfo] = None) -> T:
     def save(
         self,
         data: Dataset,
-        extra_info: Optional[ExtraInfo] = None,
-        destination: Optional[BaseDataStore[T]] = None,
+        extra_info: ExtraInfo | None = None,
+        destination: BaseDataStore[T] | None = None,
     ) -> None:
         """Save input/update/(a)sym_output data and optionally extra info.
 
         Note: You shouldn't have to overwrite this method. Check _serialize_data() instead.
 
         Args:
           data: Dataset:
-          extra_info: Optional[ExtraInfo]:  (Default value = None)
-          destination: Optional[BaseDataStore[T]]:  (Default value = None)
+          extra_info: ExtraInfo | None:  (Default value = None)
+          destination: BaseDataStore[T] | None:  (Default value = None)
 
         Returns:
 
@@ -177,17 +172,17 @@ def get_log_level(self) -> int:
         """
         return self._logger.getEffectiveLevel()
 
-    def _load_data(self, data: Optional[T]) -> T:
+    def _load_data(self, data: T | None) -> T:
         if data is not None:
             return data
         if self._source is not None:
             return self._source.load()
         raise ValueError("No data supplied!")
 
     @abstractmethod  # pragma: nocover
-    def _parse_data(self, data: T, data_type: DatasetType, extra_info: Optional[ExtraInfo]) -> Dataset:
+    def _parse_data(self, data: T, data_type: DatasetType, extra_info: ExtraInfo | None) -> Dataset:
         pass
 
     @abstractmethod  # pragma: nocover
-    def _serialize_data(self, data: Dataset, extra_info: Optional[ExtraInfo]) -> T:
+    def _serialize_data(self, data: Dataset, extra_info: ExtraInfo | None) -> T:
         pass