From be2d7641381d58d24208e9233a70a1a67832c1e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 05:10:44 +0000 Subject: [PATCH 1/3] Update pandapower requirement from <3.1,>2.11.1 to >2.11.1,<3.2 Updates the requirements on [pandapower](https://github.com/e2nIEE/pandapower) to permit the latest version. - [Release notes](https://github.com/e2nIEE/pandapower/releases) - [Changelog](https://github.com/e2nIEE/pandapower/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/e2nIEE/pandapower/compare/v2.12.0...v3.1.1) --- updated-dependencies: - dependency-name: pandapower dependency-version: 3.1.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 622d3f66..b21c62a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ dev = [ ] examples = [ "power-grid-model>1.9.80", - "pandapower>2.11.1, <3.0", # pandapower 3.0.0 has differences in results cfr. https://github.com/e2nIEE/pandapower/issues/2557 + "pandapower>2.11.1, <4.0", # pandapower 3.0.0 has differences in results cfr. https://github.com/e2nIEE/pandapower/issues/2557 "pyarrow", # Pyarrow support for Python 3.12 scheduled for 14.0.0: https://github.com/apache/arrow/issues/37880 ] doc = [ From 5ad8c43b80a510cea7fd7bacd7a44c666c451184 Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Mon, 2 Jun 2025 07:45:09 +0200 Subject: [PATCH 2/3] resolve #306 - revert pandapower-3.0.0 test logic workaround Signed-off-by: Martijn Govers --- .github/workflows/build-test-release.yml | 12 +----------- pyproject.toml | 9 +++------ .../converters/pandapower_converter.py | 2 +- .../converters/test_pandapower_converter_input.py | 4 +--- .../converters/test_pandapower_converter_input.py | 3 --- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 90027210..3df0b192 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -90,13 +90,8 @@ jobs: path: wheelhouse/ - name: Install built wheel file (Python 3.11 and 3.12) - if: matrix.python != '3.13' run: pip install power-grid-model-io[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse - - name: Install built wheel file (Python 3.13) - if: matrix.python == '3.13' - run: pip install power-grid-model-io[dev-bare]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse - - name: Unit test and coverage run: pytest --verbose @@ -125,14 +120,9 @@ jobs: name: power-grid-model-io path: wheelhouse/ - - name: Install built wheel file (Python 3.11 and 3.12) - if: matrix.python != '3.13' + - name: Install built wheel file run: pip install power-grid-model-io[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse - - name: Install built wheel file (Python 3.13) - if: matrix.python == '3.13' - run: pip install power-grid-model-io[dev-bare]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse - - name: Validation tests run: pytest tests/validation --no-cov --verbose diff --git a/pyproject.toml b/pyproject.toml index b21c62a5..57365120 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,20 +39,17 @@ dependencies = [ dynamic = ["version"] [project.optional-dependencies] -dev-bare = [ # pandapower 3.0.0 is not compatible with Python 3.13. pandapower 3.1 will be. +dev = [ "pre-commit", "pylint", "pytest", "pytest-cov", "pydantic>2", # Used in unit tests -] -dev = [ - "power-grid-model-io[dev-bare]", - "pandapower>2.11.1, <3.1", # pandapower 3.0.0 is not compatible with Python 3.13. pandapower 3.1 will be. + "pandapower>2.11.1", ] examples = [ "power-grid-model>1.9.80", - "pandapower>2.11.1, <4.0", # pandapower 3.0.0 has differences in results cfr. https://github.com/e2nIEE/pandapower/issues/2557 + "pandapower>2.11.1", "pyarrow", # Pyarrow support for Python 3.12 scheduled for 14.0.0: https://github.com/apache/arrow/issues/37880 ] doc = [ diff --git a/src/power_grid_model_io/converters/pandapower_converter.py b/src/power_grid_model_io/converters/pandapower_converter.py index f35d90bc..36fb1d21 100644 --- a/src/power_grid_model_io/converters/pandapower_converter.py +++ b/src/power_grid_model_io/converters/pandapower_converter.py @@ -35,7 +35,7 @@ # pylint: disable=too-many-instance-attributes -class PandaPowerConverter(BaseConverter[PandaPowerData]): # pragma: no cover +class PandaPowerConverter(BaseConverter[PandaPowerData]): """ Panda Power Converter """ diff --git a/tests/unit/converters/test_pandapower_converter_input.py b/tests/unit/converters/test_pandapower_converter_input.py index 23ca6575..4246e920 100644 --- a/tests/unit/converters/test_pandapower_converter_input.py +++ b/tests/unit/converters/test_pandapower_converter_input.py @@ -7,14 +7,12 @@ from unittest.mock import ANY, MagicMock, call, patch import numpy as np +import pandapower as pp import pandas as pd import pytest from packaging import version from power_grid_model import Branch3Side, BranchSide, LoadGenType, WindingType, initialize_array -pp = pytest.importorskip("pandapower", reason="pandapower is not installed") -# we add this to enable python 3.13 testing even though pandapower 3.0 is not yet compatible with it - from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter from ...utils import MockDf, MockFn, assert_struct_array_equal diff --git a/tests/validation/converters/test_pandapower_converter_input.py b/tests/validation/converters/test_pandapower_converter_input.py index 9dffa8ba..060eaaa0 100644 --- a/tests/validation/converters/test_pandapower_converter_input.py +++ b/tests/validation/converters/test_pandapower_converter_input.py @@ -15,9 +15,6 @@ from power_grid_model_io.data_types import ExtraInfo from power_grid_model_io.utils.json import JsonEncoder -pp = pytest.importorskip("pandapower", reason="pandapower is not installed") -# we add this to enable python 3.13 testing even though pandapower 3.0 is not yet compatible with it - from ...data.pandapower.pp_validation import pp_net from ..utils import compare_extra_info, component_attributes, component_objects, load_json_single_dataset, select_values From 0681fe212f72ba2a2174eb0ba133a66db0aaff1f Mon Sep 17 00:00:00 2001 From: Martijn Govers Date: Mon, 2 Jun 2025 07:53:08 +0200 Subject: [PATCH 3/3] resolve missing revert gh action step title Signed-off-by: Martijn Govers --- .github/workflows/build-test-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 3df0b192..6f11f23e 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -89,7 +89,7 @@ jobs: name: power-grid-model-io path: wheelhouse/ - - name: Install built wheel file (Python 3.11 and 3.12) + - name: Install built wheel file run: pip install power-grid-model-io[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse - name: Unit test and coverage