power-grid-model-io 1.3.3__tar.gz → 1.3.6__tar.gz

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-io
-Version: 1.3.3
+Version: 1.3.6
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -33,6 +33,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pydantic>2; extra == "dev"
 Requires-Dist: pandapower>2.11.1; extra == "dev"
 Provides-Extra: examples

power_grid_model_io-1.3.6/PYPI_VERSION

@@ -0,0 +1 @@
+1.3.6

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/pyproject.toml

@@ -44,6 +44,7 @@ dev = [
     "pylint",
     "pytest",
     "pytest-cov",
+    "ruff",
     "pydantic>2", # Used in unit tests
     "pandapower>2.11.1",
 ]
@@ -89,33 +90,43 @@ addopts = [
 ]
 xfail_strict = true
 
-[tool.black]
+[tool.ruff]
+# Same as Black.
 line-length = 120
-target-version = ["py311", "py312", "py313"]
+indent-width = 4
+show-fixes = true
 
-[tool.isort]
-profile = "black"
-line_length = 120
+# Assume Python 3.11
+target-version = "py311"
 
-[tool.pylint]
-max-line-length = 120
-ignore-paths = [
-    "docs/",
-    "examples/",
-    "tests/",
-    "setup.py",
-]
-disable = [
-    "fixme", # allow todos
-]
-good-names=[
-    "ex",   # exception
-    "i",    # iterator or current
-    "p",    # active power
-    "q",    # reactive power
-    "s",    # power (p + q)
-    "v",    # voltage
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # isort
+    "I",
+    "SIM",
+    "YTT",
+    "BLE",
+    "PERF",
+    "Q",
+    "ICN",
+    "ISC",
+    "G",
+    "LOG",
+    "EXE",
+    "FA",
+    "FURB",
+    "FLY",
+    "SLOT",
 ]
+ignore = ["SIM108", "SIM118", "SIM110", "SIM211"]
+
+[tool.ruff.lint.isort]
+# Imports that are imported using keyword "as" and are from the same source - are combined.
+combine-as-imports = true
 
 [tool.mypy]
 follow_imports = "silent"

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/converters/__init__.py

@@ -8,3 +8,5 @@ Converters
 from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter
 from power_grid_model_io.converters.pgm_json_converter import PgmJsonConverter
 from power_grid_model_io.converters.vision_excel_converter import VisionExcelConverter
+
+__all__ = ["PandaPowerConverter", "PgmJsonConverter", "VisionExcelConverter"]

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/converters/base_converter.py

@@ -4,6 +4,7 @@
 """
 Abstract converter class
 """
+
 import logging
 from abc import ABC, abstractmethod
 from typing import Generic, Optional, Tuple, TypeVar

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/converters/pandapower_converter.py

@@ -461,7 +461,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         }
         if not all(checks.values()):
             failed_checks = ", ".join([key for key, value in checks.items() if not value])
-            logger.warning(f"Zero sequence parameters given in external grid shall be ignored:{failed_checks}")
+            logger.warning("Zero sequence parameters given in external grid shall be ignored: %s", failed_checks)
 
         pgm_sources = initialize_array(data_type="input", component_type="source", shape=len(pp_ext_grid))
         pgm_sources["id"] = self._generate_ids("ext_grid", pp_ext_grid.index)
@@ -753,7 +753,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         }
         if not all(checks.values()):
             failed_checks = ", ".join([key for key, value in checks.items() if not value])
-            logger.warning(f"Zero sequence parameters given in trafo shall be ignored:{failed_checks}")
+            logger.warning("Zero sequence parameters given in trafo shall be ignored: %s", failed_checks)
 
         # Do not use taps when mandatory tap data is not available
         no_taps = np.equal(tap_side, None) | np.isnan(tap_pos) | np.isnan(tap_nom) | np.isnan(tap_size)
@@ -862,7 +862,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         }
         if not all(checks.values()):
             failed_checks = ", ".join([key for key, value in checks.items() if not value])
-            logger.warning(f"Zero sequence parameters given in trafo3w are ignored: {failed_checks}")
+            logger.warning("Zero sequence parameters given in trafo3w are ignored: %s", failed_checks)
 
         # Do not use taps when mandatory tap data is not available
         no_taps = np.equal(tap_side, None) | np.isnan(tap_pos) | np.isnan(tap_nom) | np.isnan(tap_size)

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/converters/pgm_json_converter.py

@@ -238,7 +238,7 @@ class PgmJsonConverter(BaseConverter[StructuredData]):
         """
 
         # This should be a single data set
-        for component, array in data.items():
+        for array in data.values():
             if not isinstance(array, np.ndarray) or array.ndim != 1:
                 raise ValueError("Invalid data format")
 

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/converters/tabular_converter.py

@@ -265,6 +265,9 @@ class TabularConverter(BaseConverter[TabularData]):
         """
         # To avoid mistakes, the attributes in the mapping should exist. There is one extra attribute called
         # 'extra' in which extra information can be captured.
+        if pgm_data.dtype.names is None:
+            raise ValueError(f"pgm_data for '{component}s' has no attributes defined. (dtype.names is None)")
+
         if attr not in pgm_data.dtype.names and attr not in ["extra", "filters"]:
             attrs = ", ".join(pgm_data.dtype.names)
             raise KeyError(f"Could not find attribute '{attr}' for '{component}s'. (choose from: {attrs})")

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/data_stores/vision_excel_file_store.py

@@ -4,6 +4,7 @@
 """
 Vision Excel file store
 """
+
 from pathlib import Path
 from typing import Optional
 

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/data_types/__init__.py

@@ -7,3 +7,5 @@ Common data types used in the Power Grid Model project
 
 from power_grid_model_io.data_types._data_types import ExtraInfo, ExtraInfoLookup, StructuredData
 from power_grid_model_io.data_types.tabular_data import LazyDataFrame, TabularData
+
+__all__ = ["ExtraInfo", "ExtraInfoLookup", "StructuredData", "LazyDataFrame", "TabularData"]

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/functions/__init__.py

@@ -17,3 +17,15 @@ from power_grid_model_io.functions._functions import (
     value_or_default,
     value_or_zero,
 )
+
+__all__ = [
+    "both_zeros_to_nan",
+    "complex_inverse_imaginary_part",
+    "complex_inverse_real_part",
+    "degrees_to_clock",
+    "get_winding",
+    "has_value",
+    "is_greater_than",
+    "value_or_default",
+    "value_or_zero",
+]

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/mappings/tabular_mapping.py

@@ -4,6 +4,7 @@
 """
 Tabular data mapping helper class
 """
+
 from typing import Dict, Generator, List, Tuple, Union
 
 import structlog

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/mappings/value_mapping.py

@@ -4,6 +4,7 @@
 """
 Value substitution helper class
 """
+
 from typing import Dict, Optional, Union
 
 import structlog

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/utils/auto_id.py

@@ -4,6 +4,7 @@
 """
 Automatic ID generator class
 """
+
 import collections
 from collections.abc import Hashable
 from typing import Any, Dict, List, Optional, Union

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/utils/dict.py

@@ -4,6 +4,7 @@
 """
 General dictionary utilities
 """
+
 from copy import deepcopy
 from typing import Dict
 

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/utils/excel_ambiguity_checker.py

@@ -19,6 +19,7 @@ Requirements:
     - xml.etree.ElementTree for parsing XML structures within the Excel file.
     - zipfile to handle the Excel file as a ZIP archive for parsing.
 """
+
 import os
 import xml.etree.ElementTree as ET
 import zipfile
@@ -80,11 +81,10 @@ class ExcelAmbiguityChecker:
             list: A list of shared strings used in the Excel file.
         """
         shared_strings_path = SHARED_STR_PATH
-        shared_strings = []
+        shared_strings: List[Optional[str]] = []
         with zip_file.open(shared_strings_path) as f:
             tree = ET.parse(f)
-            for si in tree.findall(FIND_T, namespaces=XML_NAME_SPACE):
-                shared_strings.append(si.text)
+            shared_strings.extend(si.text for si in tree.findall(FIND_T, namespaces=XML_NAME_SPACE))
         return shared_strings
 
     def _get_column_names_from_row(self, row, shared_strings) -> List[Optional[str]]:

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io/utils/modules.py

@@ -4,6 +4,7 @@
 """
 Module utilities, expecially useful for loading optional dependencies
 """
+
 from importlib import import_module
 from typing import Callable
 

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-io
-Version: 1.3.3
+Version: 1.3.6
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -33,6 +33,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pydantic>2; extra == "dev"
 Requires-Dist: pandapower>2.11.1; extra == "dev"
 Provides-Extra: examples

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/src/power_grid_model_io.egg-info/requires.txt

@@ -11,6 +11,7 @@ pre-commit
 pylint
 pytest
 pytest-cov
+ruff
 pydantic>2
 pandapower>2.11.1
 

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/tests/conftest.py

@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
+from contextlib import suppress
+
 import pandas as pd
 
-try:
+with suppress(pd.errors.OptionError):
     pd.set_option("future.no_silent_downcasting", True)
-except pd.errors.OptionError:
-    pass

{power_grid_model_io-1.3.3 → power_grid_model_io-1.3.6}/tests/unit/conftest.py

@@ -2,10 +2,10 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
+from contextlib import suppress
+
 import pandas as pd
 
-try:
+with suppress(pd.errors.OptionError):
     # TODO(mgovers) We're ready for Pandas 3.x, but pandapower is not. Move to parent conftest when it is.
     pd.set_option("mode.copy_on_write", True)
-except pd.errors.OptionError:
-    pass