Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,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: Unit test and coverage
run: pytest --verbose

Expand Down Expand Up @@ -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

Expand Down
9 changes: 3 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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, <3.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 = [
Expand Down
2 changes: 1 addition & 1 deletion src/power_grid_model_io/converters/pandapower_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


# pylint: disable=too-many-instance-attributes
class PandaPowerConverter(BaseConverter[PandaPowerData]): # pragma: no cover
class PandaPowerConverter(BaseConverter[PandaPowerData]):
"""
Panda Power Converter
"""
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/converters/test_pandapower_converter_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down