Merge pull request PowerGridModel#375 from furqan463/update_ruff

Update Ruff Rules (PT)

Author: figueroa1395

pyproject.toml

@@ -164,7 +164,7 @@ select = [
     # raise vanilla args
     "TRY002",
     # pytest-style
-    #"PT",
+    "PT",
 ]
 ignore = []
 

tests/unit/converters/test_pandapower_converter_input.py

@@ -125,9 +125,12 @@ def create_input_data():
     create_input_data_mock.assert_called_once_with()
     fill_pgm_extra_info_mock.assert_not_called()
     fill_pp_extra_info_mock.assert_not_called()
-    assert len(converter.pp_input_data) == 1 and "bus" in converter.pp_input_data
-    assert len(converter.pgm_input_data) == 1 and ComponentType.node in converter.pgm_input_data
-    assert len(result) == 1 and ComponentType.node in result
+    assert len(converter.pp_input_data) == 1
+    assert "bus" in converter.pp_input_data
+    assert len(converter.pgm_input_data) == 1
+    assert ComponentType.node in converter.pgm_input_data
+    assert len(result) == 1
+    assert ComponentType.node in result
 
 
 @patch("power_grid_model_io.converters.pandapower_converter.PandaPowerConverter._fill_pgm_extra_info")
@@ -155,7 +158,7 @@ def test_parse_data__update_data():
     converter = PandaPowerConverter()
 
     # Act/Assert
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match=r"Data type: 'update' is not implemented"):
         converter._parse_data(data={}, data_type=DatasetType.update, extra_info=None)
 
 
@@ -265,9 +268,12 @@ def create_output_data():
     create_output_data_mock.assert_called_once_with()
     extra_info_to_idx_lookup.assert_not_called()
     extra_info_pgm_input_data.assert_not_called()
-    assert len(converter.pp_output_data) == 1 and "res_line" in converter.pp_output_data
-    assert len(converter.pgm_output_data) == 1 and ComponentType.line in converter.pgm_output_data
-    assert len(result) == 1 and "res_line" in result
+    assert len(converter.pp_output_data) == 1
+    assert "res_line" in converter.pp_output_data
+    assert len(converter.pgm_output_data) == 1
+    assert ComponentType.line in converter.pgm_output_data
+    assert len(result) == 1
+    assert "res_line" in result
 
 
 @patch("power_grid_model_io.converters.pandapower_converter.PandaPowerConverter._extra_info_to_idx_lookup")
@@ -292,9 +298,12 @@ def create_output_data_3ph():
     create_output_data_3ph_mock.assert_called_once_with()
     extra_info_to_idx_lookup.assert_not_called()
     extra_info_pgm_input_data.assert_not_called()
-    assert len(converter.pp_output_data) == 1 and "res_line_3ph" in converter.pp_output_data
-    assert len(converter.pgm_output_data) == 1 and ComponentType.line in converter.pgm_output_data
-    assert len(result) == 1 and "res_line_3ph" in result
+    assert len(converter.pp_output_data) == 1
+    assert "res_line_3ph" in converter.pp_output_data
+    assert len(converter.pgm_output_data) == 1
+    assert ComponentType.line in converter.pgm_output_data
+    assert len(result) == 1
+    assert "res_line_3ph" in result
 
 
 def test__serialize_data__invalid_output():
@@ -1786,7 +1795,6 @@ def test_create_pgm_input_motors__existing_loads() -> None:
         PandaPowerConverter._create_pgm_input_transformers,
         PandaPowerConverter._create_pgm_input_wards,
         PandaPowerConverter._create_pgm_input_xwards,
-        PandaPowerConverter._create_pgm_input_sources,
         PandaPowerConverter._create_pgm_input_generators,
         PandaPowerConverter._create_pgm_input_dclines,
     ],
@@ -2026,7 +2034,7 @@ def test_get_winding_types__value_error():
     converter.pp_input_data = {"trafo": pd.DataFrame([(1, "ADyn")], columns=["id", "vector_group"])}
 
     # Act / Assert
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match=r"Invalid transformer connection string: 'ADyn'"):
         converter.get_trafo_winding_types()
 
 
@@ -2036,7 +2044,7 @@ def test_get_trafo3w_winding_types__value_error():
     converter.pp_input_data = {"trafo3w": pd.DataFrame([(1, "ADyndrr")], columns=["id", "vector_group"])}
 
     # Act / Assert
-    with pytest.raises(ValueError):
+    with pytest.raises(ValueError, match=r"Invalid three winding transformer connection string: 'ADyndrr'"):
         converter.get_trafo3w_winding_types()
 
 

tests/unit/converters/test_pandapower_converter_output.py

@@ -834,7 +834,7 @@ def test_pp_switch_output():
 
 
 @patch("power_grid_model_io.converters.pandapower_converter.np.matmul")
-def test_output_bus_3ph(_mock_np_array: MagicMock, converter):
+def test_output_bus_3ph(mock_np_array: MagicMock, converter):
     # Arrange
     mock_pgm_array = MagicMock()
     converter.pgm_output_data[ComponentType.node] = mock_pgm_array
@@ -867,6 +867,7 @@ def test_output_bus_3ph(_mock_np_array: MagicMock, converter):
 
         # result
         converter.pp_output_data.__setitem__.assert_called_once_with("res_bus_3ph", mock_pp_df.return_value)
+    mock_np_array.assert_called_once()
 
 
 def test_output_line_3ph(converter):

tests/unit/converters/test_tabular_converter.py

@@ -168,7 +168,7 @@ def test_convert_table_to_component(converter: TabularConverter, tabular_data_no
     "power_grid_model_io.converters.tabular_converter.TabularConverter._parse_table_filters",
 )
 def test_convert_table_to_component__filters(
-    _parse_table_filters: MagicMock,
+    parse_table_filters: MagicMock,
     converter: TabularConverter,
     tabular_data_no_units_no_substitutions: TabularData,
 ):
@@ -185,7 +185,7 @@ def test_convert_table_to_component__filters(
         attributes=node_attributes_with_filter,
         extra_info=None,
     )
-    _parse_table_filters.assert_called_once_with(
+    parse_table_filters.assert_called_once_with(
         data=tabular_data_no_units_no_substitutions,
         table="nodes",
         filtering_functions=node_attributes_with_filter["filters"],
@@ -200,8 +200,8 @@ def test_convert_table_to_component__filters(
     side_effect=np.array([False, False]),
 )
 def test_convert_table_to_component__filters_all_false(
-    _parse_table_filters: MagicMock,
-    _convert_col_def_to_attribute: MagicMock,
+    parse_table_filters: MagicMock,
+    convert_col_def_to_attribute: MagicMock,
     converter: TabularConverter,
     tabular_data_no_units_no_substitutions: TabularData,
 ):
@@ -220,12 +220,12 @@ def test_convert_table_to_component__filters_all_false(
     )
 
     assert actual is None
-    _parse_table_filters.assert_called_once_with(
+    parse_table_filters.assert_called_once_with(
         data=tabular_data_no_units_no_substitutions,
         table="nodes",
         filtering_functions=node_attributes_with_filter["filters"],
     )
-    _convert_col_def_to_attribute.assert_not_called()
+    convert_col_def_to_attribute.assert_not_called()
 
 
 def test_convert_col_def_to_attribute(

tests/unit/data_stores/test_csv_dir_store.py

@@ -14,7 +14,7 @@
 from power_grid_model_io.data_types import TabularData
 
 
-@pytest.fixture()
+@pytest.fixture
 def temp_dir():
     with tempfile.TemporaryDirectory() as tmp:
         yield Path(tmp).resolve()

tests/unit/data_stores/test_excel_file_store.py

@@ -8,7 +8,6 @@
 import numpy as np
 import pandas as pd
 import pytest
-from pytest import param
 from structlog.testing import capture_logs
 
 from power_grid_model_io.data_stores.excel_file_store import ExcelFileStore
@@ -18,15 +17,15 @@
 PandasExcelData = dict[str, pd.DataFrame]
 
 
-@pytest.fixture()
+@pytest.fixture
 def objects_excel() -> PandasExcelData:
     return {
         "Nodes": pd.DataFrame([["A", 111.0], ["B", 222.0]], columns=("NAME", "U_NOM")),
         "Lines": pd.DataFrame([["C", "A", "B", "X"]], columns=("NAME", "NODE0", "NODE1", "TYPE")),
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def specs_excel() -> PandasExcelData:
     return {
         "Colors": pd.DataFrame([["A", "Red"], ["B", "Yellow"]], columns=("NODE", "COLOR")),
@@ -233,11 +232,11 @@ def test_save__multiple_files(mock_to_excel: MagicMock, mock_excel_writer):
 @pytest.mark.parametrize(
     ("column_name", "is_unnamed"),
     [
-        param("", False, id="empty"),
-        param("id", False, id="id"),
-        param("Unnamed: 123_level_1", True, id="unnamed"),
-        param("Unnamed", False, id="not_unnamed"),
-        param("123", False, id="number_as_str"),
+        pytest.param("", False, id="empty"),
+        pytest.param("id", False, id="id"),
+        pytest.param("Unnamed: 123_level_1", True, id="unnamed"),
+        pytest.param("Unnamed", False, id="not_unnamed"),
+        pytest.param("123", False, id="number_as_str"),
     ],
 )
 def test_unnamed_pattern(column_name: str, is_unnamed: bool):

tests/unit/data_stores/test_json_file_store.py

@@ -11,12 +11,12 @@
 from power_grid_model_io.utils.json import JsonEncoder
 
 
-@pytest.fixture()
+@pytest.fixture
 def single_data() -> StructuredData:
     return {"node": [{"id": 0, "u_rated": 10.5e3}]}
 
 
-@pytest.fixture()
+@pytest.fixture
 def batch_data() -> StructuredData:
     return [{"source": [{"id": 1, "p_specified": 1e6}]}, {"source": [{"id": 1, "p_specified": 2e6}]}]
 

tests/unit/data_types/test_tabular_data.py

@@ -15,36 +15,36 @@
 from tests.utils import assert_log_exists
 
 
-@pytest.fixture()
+@pytest.fixture
 def nodes() -> pd.DataFrame:
     return pd.DataFrame([(0, 150e3), (1, 10.5e3), (2, 400.0)], columns=["id", "u_rated"])
 
 
-@pytest.fixture()
+@pytest.fixture
 def nodes_iso() -> pd.DataFrame:
     return pd.DataFrame(
         [(0, 150e3), (1, 10.5e3), (2, 400.0)], columns=pd.MultiIndex.from_tuples((("id", ""), ("u_rated", "V")))
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def nodes_kv() -> pd.DataFrame:
     return pd.DataFrame(
         [(0, 150), (1, 10.5), (2, 0.4)], columns=pd.MultiIndex.from_tuples((("id", ""), ("u_rated", "kV")))
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def nodes_vl() -> pd.DataFrame:
     return pd.DataFrame([(0, "hv"), (1, "mv"), (2, "lv")], columns=("id", "u_rated"))
 
 
-@pytest.fixture()
+@pytest.fixture
 def nodes_np() -> np.ndarray:
     return np.array([(0, 150e3), (1, 10.5e3), (2, 400.0)], dtype=[("id", "i4"), ("u_rated", "f4")])
 
 
-@pytest.fixture()
+@pytest.fixture
 def lines() -> pd.DataFrame:
     return pd.DataFrame([(2, 0, 1), (3, 2, 3)], columns=("id", "from_node", "to_node"))
 

tests/unit/functions/test_functions.py

@@ -4,8 +4,8 @@
 from unittest.mock import MagicMock, patch
 
 import numpy as np
+import pytest
 from power_grid_model import WindingType
-from pytest import approx, mark
 
 from power_grid_model_io.functions import (
     both_zeros_to_nan,
@@ -20,7 +20,7 @@
 )
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("value", "expected"),
     [
         (None, False),
@@ -37,7 +37,7 @@
     ],
 )
 def test_has_value(value, expected):
-    assert has_value(value) == approx(expected)
+    assert has_value(value) == pytest.approx(expected)
 
 
 @patch("power_grid_model_io.functions.has_value")
@@ -58,7 +58,7 @@ def test_value_or_zero(mock_value_or_default: MagicMock):
     mock_value_or_default.assert_called_once_with(value=1.23, default=0.0)
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("real", "imag", "expected"),
     [
         (float("nan"), float("nan"), float("nan")),
@@ -70,10 +70,10 @@ def test_value_or_zero(mock_value_or_default: MagicMock):
 )
 def test_complex_inverse_real_part(real: float, imag: float, expected: float):
     actual = complex_inverse_real_part(real, imag)
-    assert actual == approx(expected) or (np.isnan(actual) and np.isnan(expected))
+    assert actual == pytest.approx(expected) or (np.isnan(actual) and np.isnan(expected))
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("real", "imag", "expected"),
     [
         (float("nan"), float("nan"), float("nan")),
@@ -85,10 +85,10 @@ def test_complex_inverse_real_part(real: float, imag: float, expected: float):
 )
 def test_complex_inverse_imaginary_part(real: float, imag: float, expected: float):
     actual = complex_inverse_imaginary_part(real, imag)
-    assert actual == approx(expected) or (np.isnan(actual) and np.isnan(expected))
+    assert actual == pytest.approx(expected) or (np.isnan(actual) and np.isnan(expected))
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("winding", "neutral_grounding", "expected"),
     [
         ("Y", True, WindingType.wye),
@@ -118,7 +118,7 @@ def test_get_winding(winding: str, neutral_grounding: bool, expected: WindingTyp
     assert actual == expected
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("degrees", "expected"),
     [
         (360, 0),
@@ -129,10 +129,10 @@ def test_get_winding(winding: str, neutral_grounding: bool, expected: WindingTyp
 )
 def test_degrees_to_clock(degrees: float, expected: int):
     actual = degrees_to_clock(degrees)
-    assert actual == approx(expected) or (np.isnan(actual) and np.isnan(expected))
+    assert actual == pytest.approx(expected) or (np.isnan(actual) and np.isnan(expected))
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("left_side", "right_side", "expected"),
     [
         (float("nan"), float("nan"), False),
@@ -146,7 +146,7 @@ def test_is_greater_than(left_side: float, right_side: list[float], expected: fl
     assert actual == expected
 
 
-@mark.parametrize(
+@pytest.mark.parametrize(
     ("value", "other_value", "expected"),
     [
         (float("nan"), float("nan"), float("nan")),
@@ -162,4 +162,4 @@ def test_is_greater_than(left_side: float, right_side: list[float], expected: fl
 )
 def test_both_zeros_to_nan(value: float, other_value: float, expected: float):
     actual = both_zeros_to_nan(value, other_value)
-    assert actual == approx(expected) or (np.isnan(actual) and np.isnan(expected))
+    assert actual == pytest.approx(expected) or (np.isnan(actual) and np.isnan(expected))