Skip to content

Commit d03badc

Browse files
authored
Merge pull request #310 from PowerGridModel/dependabot/pip/pandapower-gt-2.11.1-and-lt-3.2
Update pandapower requirement from <3.1,>2.11.1 to >2.11.1
2 parents c21d35f + 0681fe2 commit d03badc

File tree

5 files changed

+7
-25
lines changed

5 files changed

+7
-25
lines changed

.github/workflows/build-test-release.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,9 @@ jobs:
8989
name: power-grid-model-io
9090
path: wheelhouse/
9191

92-
- name: Install built wheel file (Python 3.11 and 3.12)
93-
if: matrix.python != '3.13'
92+
- name: Install built wheel file
9493
run: pip install power-grid-model-io[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse
9594

96-
- name: Install built wheel file (Python 3.13)
97-
if: matrix.python == '3.13'
98-
run: pip install power-grid-model-io[dev-bare]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse
99-
10095
- name: Unit test and coverage
10196
run: pytest --verbose
10297

@@ -125,14 +120,9 @@ jobs:
125120
name: power-grid-model-io
126121
path: wheelhouse/
127122

128-
- name: Install built wheel file (Python 3.11 and 3.12)
129-
if: matrix.python != '3.13'
123+
- name: Install built wheel file
130124
run: pip install power-grid-model-io[dev]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse
131125

132-
- name: Install built wheel file (Python 3.13)
133-
if: matrix.python == '3.13'
134-
run: pip install power-grid-model-io[dev-bare]==${{ needs.build-python.outputs.version }} --find-links=wheelhouse
135-
136126
- name: Validation tests
137127
run: pytest tests/validation --no-cov --verbose
138128

pyproject.toml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,17 @@ dependencies = [
3939
dynamic = ["version"]
4040

4141
[project.optional-dependencies]
42-
dev-bare = [ # pandapower 3.0.0 is not compatible with Python 3.13. pandapower 3.1 will be.
42+
dev = [
4343
"pre-commit",
4444
"pylint",
4545
"pytest",
4646
"pytest-cov",
4747
"pydantic>2", # Used in unit tests
48-
]
49-
dev = [
50-
"power-grid-model-io[dev-bare]",
51-
"pandapower>2.11.1, <3.1", # pandapower 3.0.0 is not compatible with Python 3.13. pandapower 3.1 will be.
48+
"pandapower>2.11.1",
5249
]
5350
examples = [
5451
"power-grid-model>1.9.80",
55-
"pandapower>2.11.1, <3.0", # pandapower 3.0.0 has differences in results cfr. https://github.com/e2nIEE/pandapower/issues/2557
52+
"pandapower>2.11.1",
5653
"pyarrow", # Pyarrow support for Python 3.12 scheduled for 14.0.0: https://github.com/apache/arrow/issues/37880
5754
]
5855
doc = [

src/power_grid_model_io/converters/pandapower_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636

3737
# pylint: disable=too-many-instance-attributes
38-
class PandaPowerConverter(BaseConverter[PandaPowerData]): # pragma: no cover
38+
class PandaPowerConverter(BaseConverter[PandaPowerData]):
3939
"""
4040
Panda Power Converter
4141
"""

tests/unit/converters/test_pandapower_converter_input.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
from unittest.mock import ANY, MagicMock, call, patch
88

99
import numpy as np
10+
import pandapower as pp
1011
import pandas as pd
1112
import pytest
1213
from packaging import version
1314
from power_grid_model import Branch3Side, BranchSide, LoadGenType, WindingType, initialize_array
1415

15-
pp = pytest.importorskip("pandapower", reason="pandapower is not installed")
16-
# we add this to enable python 3.13 testing even though pandapower 3.0 is not yet compatible with it
17-
1816
from power_grid_model_io.converters.pandapower_converter import PandaPowerConverter
1917

2018
from ...utils import MockDf, MockFn, assert_struct_array_equal

tests/validation/converters/test_pandapower_converter_input.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
from power_grid_model_io.data_types import ExtraInfo
1616
from power_grid_model_io.utils.json import JsonEncoder
1717

18-
pp = pytest.importorskip("pandapower", reason="pandapower is not installed")
19-
# we add this to enable python 3.13 testing even though pandapower 3.0 is not yet compatible with it
20-
2118
from ...data.pandapower.pp_validation import pp_net
2219
from ..utils import compare_extra_info, component_attributes, component_objects, load_json_single_dataset, select_values
2320

0 commit comments

Comments
 (0)