From ac2c91e0e4466b12ad7814d2a618f56b909153be Mon Sep 17 00:00:00 2001 From: Max Chesterfield Date: Fri, 14 Nov 2025 12:08:25 +1100 Subject: [PATCH 1/2] Fix import error, add test Signed-off-by: Max Chesterfield --- .../ewb/model/cim/iec61970/base/wires/conductor.py | 2 +- test/cim/iec61970/base/wires/test_connector.py | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py b/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py index 26953829..eddeaae6 100644 --- a/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py +++ b/src/zepben/ewb/model/cim/iec61970/base/wires/conductor.py @@ -8,9 +8,9 @@ from typing import Optional, TYPE_CHECKING from zepben.ewb.model.cim.iec61970.base.core.conducting_equipment import ConductingEquipment +from zepben.ewb.model.cim.iec61968.assetinfo.cable_info import CableInfo if TYPE_CHECKING: - from zepben.ewb.model.cim.iec61968.assetinfo.cable_info import CableInfo from zepben.ewb.model.cim.iec61968.assetinfo.wire_info import WireInfo diff --git a/test/cim/iec61970/base/wires/test_connector.py b/test/cim/iec61970/base/wires/test_connector.py index 506d0e4e..b7c05118 100644 --- a/test/cim/iec61970/base/wires/test_connector.py +++ b/test/cim/iec61970/base/wires/test_connector.py @@ -5,7 +5,7 @@ from cim.iec61970.base.core.test_conducting_equipment import conducting_equipment_kwargs, verify_conducting_equipment_constructor_default, \ verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args -from zepben.ewb import Connector +from zepben.ewb import Connector, Conductor, CableInfo connector_kwargs = conducting_equipment_kwargs connector_args = conducting_equipment_args @@ -21,3 +21,11 @@ def verify_connector_constructor_kwargs(c: Connector, **kwargs): def verify_connector_constructor_args(c: Connector): verify_conducting_equipment_constructor_args(c) + + +def test_is_underground(): + c = Conductor() + assert not c.is_underground() + + c.wire_info = CableInfo() + assert c.is_underground() From 62b2abab45efa646ad98f24bcde04eb8e192900b Mon Sep 17 00:00:00 2001 From: Max Chesterfield Date: Fri, 14 Nov 2025 12:10:02 +1100 Subject: [PATCH 2/2] Changelog, duh. Signed-off-by: Max Chesterfield --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index d2a55fcd..6c9781dd 100644 --- a/changelog.md +++ b/changelog.md @@ -16,6 +16,7 @@ * Moved ZepbenTokenAuth to use python dataclasses instead of `zepben.ewb.dataclassy`, existing code should work as is. * `TypeError`s occurring in `StepAction`s will no longer silently pass * Drop python 3.9 from list of test envs in tox +* Fix an ImportError being raised when calling `Conductor.is_underground()` ### Notes * None.