diff --git a/hugr-py/src/hugr/cfg.py b/hugr-py/src/hugr/cfg.py index 78b997cbb..1d9b364a0 100644 --- a/hugr-py/src/hugr/cfg.py +++ b/hugr-py/src/hugr/cfg.py @@ -8,7 +8,8 @@ from typing_extensions import Self -from . import ops, val +from hugr import ops, val + from .dfg import _DfBase from .exceptions import MismatchedExit, NoSiblingAncestor, NotInSameCfg from .hugr import Hugr, ParentBuilder diff --git a/hugr-py/src/hugr/cond_loop.py b/hugr-py/src/hugr/cond_loop.py index 4bb60bf32..171de3a0e 100644 --- a/hugr-py/src/hugr/cond_loop.py +++ b/hugr-py/src/hugr/cond_loop.py @@ -10,7 +10,8 @@ from typing_extensions import Self -from . import ops +from hugr import ops + from .dfg import _DfBase from .hugr import Hugr, ParentBuilder diff --git a/hugr-py/src/hugr/dfg.py b/hugr-py/src/hugr/dfg.py index 2f8d46697..141e2e15f 100644 --- a/hugr-py/src/hugr/dfg.py +++ b/hugr-py/src/hugr/dfg.py @@ -12,7 +12,8 @@ from typing_extensions import Self -from . import ops, tys, val +from hugr import ops, tys, val + from .exceptions import NoSiblingAncestor from .hugr import Hugr, ParentBuilder diff --git a/hugr-py/src/hugr/hugr.py b/hugr-py/src/hugr/hugr.py index 3ceff24e0..afcd05271 100644 --- a/hugr-py/src/hugr/hugr.py +++ b/hugr-py/src/hugr/hugr.py @@ -13,8 +13,7 @@ overload, ) -from .exceptions import ParentBeforeChild -from .node_port import ( +from hugr.node_port import ( Direction, InPort, Node, @@ -24,15 +23,17 @@ ToNode, _SubPort, ) -from .ops import Call, Const, DataflowOp, Module, Op -from .serialization.ops import OpType as SerialOp -from .serialization.serial_hugr import SerialHugr -from .tys import Kind, Type, ValueKind -from .utils import BiMap -from .val import Value +from hugr.ops import Call, Const, DataflowOp, Module, Op +from hugr.serialization.ops import OpType as SerialOp +from hugr.serialization.serial_hugr import SerialHugr +from hugr.tys import Kind, Type, ValueKind +from hugr.utils import BiMap +from hugr.val import Value + +from .exceptions import ParentBeforeChild if TYPE_CHECKING: - from .val import Value + from hugr.val import Value @dataclass() diff --git a/hugr-py/src/hugr/ops.py b/hugr-py/src/hugr/ops.py index 226a92f64..61621c5f7 100644 --- a/hugr-py/src/hugr/ops.py +++ b/hugr-py/src/hugr/ops.py @@ -8,15 +8,15 @@ from typing_extensions import Self -from . import tys, val -from .node_port import Direction, InPort, Node, OutPort, PortOffset, Wire -from .serialization import ops as sops -from .utils import ser_it +import hugr.serialization.ops as sops +from hugr import tys, val +from hugr.node_port import Direction, InPort, Node, OutPort, PortOffset, Wire +from hugr.utils import ser_it if TYPE_CHECKING: from collections.abc import Sequence - from .serialization.ops import BaseOp + from hugr.serialization.ops import BaseOp @dataclass diff --git a/hugr-py/src/hugr/serialization/extension.py b/hugr-py/src/hugr/serialization/extension.py index dcf579d38..fd533e781 100644 --- a/hugr-py/src/hugr/serialization/extension.py +++ b/hugr-py/src/hugr/serialization/extension.py @@ -74,8 +74,6 @@ class Extension(ConfiguredBaseModel): @classmethod def get_version(cls) -> str: - from hugr.serialization.serial_hugr import serialization_version - return serialization_version() diff --git a/hugr-py/src/hugr/tracked_dfg.py b/hugr-py/src/hugr/tracked_dfg.py index a3867da70..956325653 100644 --- a/hugr-py/src/hugr/tracked_dfg.py +++ b/hugr-py/src/hugr/tracked_dfg.py @@ -2,10 +2,10 @@ from collections.abc import Iterable -from . import tys -from .dfg import Dfg -from .node_port import Node, Wire -from .ops import Command, ComWire +from hugr import tys +from hugr.dfg import Dfg +from hugr.node_port import Node, Wire +from hugr.ops import Command, ComWire class TrackedDfg(Dfg): diff --git a/hugr-py/src/hugr/tys.py b/hugr-py/src/hugr/tys.py index f645a5a04..7f81f71dc 100644 --- a/hugr-py/src/hugr/tys.py +++ b/hugr-py/src/hugr/tys.py @@ -5,8 +5,8 @@ from dataclasses import dataclass, field from typing import Protocol, runtime_checkable -from .serialization import tys as stys -from .utils import ser_it +import hugr.serialization.tys as stys +from hugr.utils import ser_it ExtensionId = stys.ExtensionId ExtensionSet = stys.ExtensionSet diff --git a/hugr-py/src/hugr/val.py b/hugr-py/src/hugr/val.py index 9d7505c4b..7f0a8f249 100644 --- a/hugr-py/src/hugr/val.py +++ b/hugr-py/src/hugr/val.py @@ -5,13 +5,13 @@ from dataclasses import dataclass, field from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable -from . import tys -from .serialization import ops as sops -from .serialization import tys as stys -from .utils import ser_it +import hugr.serialization.ops as sops +import hugr.serialization.tys as stys +from hugr import tys +from hugr.utils import ser_it if TYPE_CHECKING: - from .hugr import Hugr + from hugr.hugr import Hugr @runtime_checkable