Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(hugr-py): remove module underscores #1230

Merged
merged 3 commits into from
Jun 27, 2024
Merged

refactor(hugr-py): remove module underscores #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c3390e
refactor: remove module underscores
ss2165 Jun 26, 2024
4329245
test: move shared code in to conftest
ss2165 Jun 26, 2024
24319a7
refactor: remove it_works
ss2165 Jun 26, 2024
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
5 changes: 0 additions & 5 deletions hugr-py/src/hugr/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,3 @@
# This is updated by our release-please workflow, triggered by this
# annotation: x-release-please-version
__version__ = "0.2.1"


def it_works() -> str:
"""Return a string to confirm that the package is installed and working."""
return "It works!"
16 changes: 8 additions & 8 deletions hugr-py/src/hugr/_cfg.py → hugr-py/src/hugr/cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

from dataclasses import dataclass

import hugr._ops as ops

from ._dfg import _DfBase
from ._exceptions import NoSiblingAncestor, NotInSameCfg, MismatchedExit
from ._hugr import Hugr, ParentBuilder
from ._node_port import Node, Wire, ToNode
from ._tys import TypeRow, Type
import hugr._val as val
import hugr.ops as ops

from .dfg import _DfBase
from .exceptions import NoSiblingAncestor, NotInSameCfg, MismatchedExit
from .hugr import Hugr, ParentBuilder
from .node_port import Node, Wire, ToNode
from .tys import TypeRow, Type
import hugr.val as val


class Block(_DfBase[ops.DataflowBlock]):
Expand Down
10 changes: 5 additions & 5 deletions hugr-py/src/hugr/_cond_loop.py → hugr-py/src/hugr/cond_loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

from dataclasses import dataclass

import hugr._ops as ops
import hugr.ops as ops

from ._dfg import _DfBase
from ._hugr import Hugr, ParentBuilder
from ._node_port import Node, Wire, ToNode
from .dfg import _DfBase
from .hugr import Hugr, ParentBuilder
from .node_port import Node, Wire, ToNode

from ._tys import Sum, TypeRow
from .tys import Sum, TypeRow


class Case(_DfBase[ops.Case]):
Expand Down
26 changes: 13 additions & 13 deletions hugr-py/src/hugr/_dfg.py → hugr-py/src/hugr/dfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

from typing_extensions import Self

import hugr._ops as ops
import hugr._val as val
from hugr._tys import (
import hugr.ops as ops
import hugr.val as val
from hugr.tys import (
Type,
TypeRow,
get_first_sum,
Expand All @@ -23,13 +23,13 @@
ExtensionSet,
)

from ._exceptions import NoSiblingAncestor
from ._hugr import Hugr, ParentBuilder
from ._node_port import Node, OutPort, Wire, ToNode
from .exceptions import NoSiblingAncestor
from .hugr import Hugr, ParentBuilder
from .node_port import Node, OutPort, Wire, ToNode

if TYPE_CHECKING:
from ._cfg import Cfg
from ._cond_loop import Conditional, If, TailLoop
from .cfg import Cfg
from .cond_loop import Conditional, If, TailLoop

Check warning on line 32 in hugr-py/src/hugr/dfg.py

View check run for this annotation

Codecov / codecov/patch

hugr-py/src/hugr/dfg.py#L31-L32 

Added lines #L31 - L32 were not covered by tests


DP = TypeVar("DP", bound=ops.DfParentOp)
Expand Down Expand Up @@ -96,7 +96,7 @@
self,
*args: Wire,
) -> Dfg:
from ._dfg import Dfg
from .dfg import Dfg

parent_op = ops.DFG(self._wire_types(args))
dfg = Dfg.new_nested(parent_op, self.hugr, self.parent_node)
Expand All @@ -110,7 +110,7 @@
self,
*args: Wire,
) -> Cfg:
from ._cfg import Cfg
from .cfg import Cfg

cfg = Cfg.new_nested(self._wire_types(args), self.hugr, self.parent_node)
self._wire_up(cfg.parent_node, args)
Expand All @@ -120,7 +120,7 @@
return self._insert_nested_impl(cfg, *args)

def add_conditional(self, cond: Wire, *args: Wire) -> Conditional:
from ._cond_loop import Conditional
from .cond_loop import Conditional

args = (cond, *args)
(sum_, other_inputs) = get_first_sum(self._wire_types(args))
Expand All @@ -132,15 +132,15 @@
return self._insert_nested_impl(cond, *args)

def add_if(self, cond: Wire, *args: Wire) -> If:
from ._cond_loop import If
from .cond_loop import If

conditional = self.add_conditional(cond, *args)
return If(conditional.add_case(1))

def add_tail_loop(
self, just_inputs: Sequence[Wire], rest: Sequence[Wire]
) -> TailLoop:
from ._cond_loop import TailLoop
from .cond_loop import TailLoop

just_input_types = self._wire_types(just_inputs)
rest_types = self._wire_types(rest)
Expand Down
0 hugr-py/src/hugr/_exceptions.py → hugr-py/src/hugr/exceptions.py
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions hugr-py/src/hugr/_function.py → hugr-py/src/hugr/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

from dataclasses import dataclass

import hugr._ops as ops
import hugr._val as val
import hugr.ops as ops
import hugr.val as val

from ._dfg import _DfBase
from hugr._node_port import Node
from ._hugr import Hugr
from ._tys import TypeRow, TypeParam, PolyFuncType, Type, TypeBound
from .dfg import _DfBase
from hugr.node_port import Node
from .hugr import Hugr
from .tys import TypeRow, TypeParam, PolyFuncType, Type, TypeBound


@dataclass
Expand Down
10 changes: 5 additions & 5 deletions hugr-py/src/hugr/_hugr.py → hugr-py/src/hugr/hugr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
)


from hugr._ops import Op, DataflowOp, Const, Call
from hugr._tys import Type, Kind, ValueKind
from hugr._val import Value
from hugr._node_port import Direction, InPort, OutPort, ToNode, Node, _SubPort
from hugr.ops import Op, DataflowOp, Const, Call
from hugr.tys import Type, Kind, ValueKind
from hugr.val import Value
from hugr.node_port import Direction, InPort, OutPort, ToNode, Node, _SubPort
from hugr.serialization.ops import OpType as SerialOp
from hugr.serialization.serial_hugr import SerialHugr
from hugr.utils import BiMap

from ._exceptions import ParentBeforeChild
from .exceptions import ParentBeforeChild


@dataclass()
Expand Down
0 hugr-py/src/hugr/_node_port.py → hugr-py/src/hugr/node_port.py
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions hugr-py/src/hugr/_ops.py → hugr-py/src/hugr/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
from hugr.serialization.ops import BaseOp
import hugr.serialization.ops as sops
from hugr.utils import ser_it
import hugr._tys as tys
from hugr._node_port import Node, InPort, OutPort, Wire
import hugr._val as val
from ._exceptions import IncompleteOp
import hugr.tys as tys
from hugr.node_port import Node, InPort, OutPort, Wire
import hugr.val as val
from .exceptions import IncompleteOp

if TYPE_CHECKING:
from hugr._hugr import Hugr
from hugr.hugr import Hugr

Check warning on line 14 in hugr-py/src/hugr/ops.py

View check run for this annotation

Codecov / codecov/patch

hugr-py/src/hugr/ops.py#L14 

Added line #L14 was not covered by tests


@dataclass
Expand All @@ -35,7 +35,7 @@


def _sig_port_type(sig: tys.FunctionType, port: InPort | OutPort) -> tys.Type:
from hugr._hugr import Direction
from hugr.node_port import Direction

if port.direction == Direction.INCOMING:
return sig.input[port.offset]
Expand Down
Loading
Loading