Skip to content

Commit fbc8d85

Browse files
committed
refact(op): shrink repr() by removing "name="
1 parent c23cd0e commit fbc8d85

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

docs/source/composition.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ We can merge ``graphop`` and ``another_graph`` like so, avoiding a redundant ``m
135135

136136
>>> merged_graph = compose("merged_graph", graphop, another_graph, merge=True)
137137
>>> print(merged_graph)
138-
NetworkOperation(name='merged_graph',
138+
NetworkOperation('merged_graph',
139139
needs=['a', 'b', 'c'],
140140
provides=['ab', 'a_minus_ab', 'abs_a_minus_ab_cubed', 'cab'])
141141

graphtik/modifiers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class optional(str):
3333
... operation(name='myadd', needs=['a', 'b', optional('c')], provides='sum')(myadd)
3434
... )
3535
>>> graph
36-
NetworkOperation(name='mygraph',
36+
NetworkOperation('mygraph',
3737
needs=['a', 'b', optional('c')],
3838
provides=['sum'])
3939
@@ -70,7 +70,7 @@ class vararg(optional):
7070
... provides='sum')(addall)
7171
... )
7272
>>> graph
73-
NetworkOperation(name='mygraph',
73+
NetworkOperation('mygraph',
7474
needs=['a', optional('b'), optional('c')],
7575
provides=['sum'])
7676
@@ -138,7 +138,7 @@ class sideffect(str):
138138
... provides=[sideffect('df.sum')])(addcolumns)
139139
... )
140140
>>> graph
141-
NetworkOperation(name='mygraph', needs=['df', 'sideffect(df.b)'],
141+
NetworkOperation('mygraph', needs=['df', 'sideffect(df.b)'],
142142
provides=['sideffect(df.sum)'])
143143
144144
>>> df = pd.DataFrame({'a': [5, 0], 'b': [2, 1]}) # doctest: +SKIP

graphtik/op.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def __repr__(self):
105105
clsname = type(self).__name__
106106
needs = aslist(self.needs, "needs")
107107
provides = aslist(self.provides, "provides")
108-
return f"{clsname}(name={self.name!r}, needs={needs!r}, provides={provides!r})"
108+
return f"{clsname}({self.name!r}, needs={needs!r}, provides={provides!r})"
109109

110110

111111
class FunctionalOperation(Operation):

test/test_graphtik.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ def test_network_simple_merge():
237237

238238
assert (
239239
repr(net3)
240-
== "NetworkOperation(name='merged', needs=['c', 'd', 'e', 'f'], provides=['sum1', 'sum2', 'sum3', 'a', 'b'])"
240+
== "NetworkOperation('merged', needs=['c', 'd', 'e', 'f'], provides=['sum1', 'sum2', 'sum3', 'a', 'b'])"
241241
)
242242

243243

@@ -254,7 +254,7 @@ def test_network_deep_merge():
254254
assert net1(a=1, b=2, c=4) == exp
255255
assert (
256256
repr(net1)
257-
== "NetworkOperation(name='my network 1', needs=[optional('a'), 'b', 'c'], provides=['sum1', 'sum2', 'sum3'])"
257+
== "NetworkOperation('my network 1', needs=[optional('a'), 'b', 'c'], provides=['sum1', 'sum2', 'sum3'])"
258258
)
259259

260260
sum_op4 = operation(name="sum_op1", needs=[vararg("a"), "b"], provides="sum1")(
@@ -266,7 +266,7 @@ def test_network_deep_merge():
266266
assert net2(**{"a": 1, "b": 2}) == exp
267267
assert (
268268
repr(net2)
269-
== "NetworkOperation(name='my network 2', needs=[optional('a'), 'b'], provides=['sum1', 'sum2'])"
269+
== "NetworkOperation('my network 2', needs=[optional('a'), 'b'], provides=['sum1', 'sum2'])"
270270
)
271271

272272
net3 = compose("merged", net1, net2, merge=True)
@@ -275,7 +275,7 @@ def test_network_deep_merge():
275275

276276
assert (
277277
repr(net3)
278-
== "NetworkOperation(name='merged', needs=[optional('a'), 'b', 'c'], provides=['sum2', 'sum1', 'sum3'])"
278+
== "NetworkOperation('merged', needs=[optional('a'), 'b', 'c'], provides=['sum2', 'sum1', 'sum3'])"
279279
)
280280

281281
## Reverse ops, change results and `needs` optionality.
@@ -286,7 +286,7 @@ def test_network_deep_merge():
286286

287287
assert (
288288
repr(net3)
289-
== "NetworkOperation(name='merged', needs=[optional('a'), 'b', 'c'], provides=['sum1', 'sum2', 'sum3'])"
289+
== "NetworkOperation('merged', needs=[optional('a'), 'b', 'c'], provides=['sum1', 'sum2', 'sum3'])"
290290
)
291291

292292

@@ -311,7 +311,7 @@ def test_network_merge_in_doctests():
311311

312312
assert (
313313
repr(merged_graph)
314-
== "NetworkOperation(name='merged_graph', needs=['a', 'b', 'c'], provides=['ab', 'a_minus_ab', 'abs_a_minus_ab_cubed', 'cab'])"
314+
== "NetworkOperation('merged_graph', needs=['a', 'b', 'c'], provides=['ab', 'a_minus_ab', 'abs_a_minus_ab_cubed', 'cab'])"
315315
)
316316

317317

@@ -754,40 +754,40 @@ def add(a=0, b=0):
754754
netop = compose("t", *ops)
755755
assert (
756756
repr(netop)
757-
== f"NetworkOperation(name='t', needs=['a', optional('bb')], provides=[{provs}])"
757+
== f"NetworkOperation('t', needs=['a', optional('bb')], provides=[{provs}])"
758758
)
759759

760760
## Narrow by `needs`
761761
#
762762
netop = compose("t", *ops, needs=["a"])
763-
assert repr(netop) == f"NetworkOperation(name='t', needs=['a'], provides=[{provs}])"
763+
assert repr(netop) == f"NetworkOperation('t', needs=['a'], provides=[{provs}])"
764764

765765
netop = compose("t", *ops, needs=["bb"])
766766
assert (
767767
repr(netop)
768-
== "NetworkOperation(name='t', needs=[optional('bb')], provides=['sum1'])"
768+
== "NetworkOperation('t', needs=[optional('bb')], provides=['sum1'])"
769769
)
770770

771771
## Narrow by `provides`
772772
#
773773
netop = compose("t", *ops, provides="sum1")
774774
assert (
775775
repr(netop)
776-
== "NetworkOperation(name='t', needs=[optional('a'), optional('bb')], provides=['sum1'])"
776+
== "NetworkOperation('t', needs=[optional('a'), optional('bb')], provides=['sum1'])"
777777
)
778778

779779
netop = compose("t", *ops, provides=["sum2"])
780780
assert (
781781
repr(netop)
782-
== "NetworkOperation(name='t', needs=['a', optional('bb')], provides=['sum2'])"
782+
== "NetworkOperation('t', needs=['a', optional('bb')], provides=['sum2'])"
783783
)
784784

785785
## Narrow by BOTH
786786
#
787787
netop = compose("t", *ops, needs="a", provides=["sum1"])
788788
assert (
789789
repr(netop)
790-
== "NetworkOperation(name='t', needs=[optional('a')], provides=['sum1'])"
790+
== "NetworkOperation('t', needs=[optional('a')], provides=['sum1'])"
791791
)
792792

793793
with pytest.raises(ValueError, match="Impossible outputs:"):
@@ -796,7 +796,7 @@ def add(a=0, b=0):
796796
## Narrow by unknown needs
797797
#
798798
netop = compose("t", *ops, needs="BAD")
799-
assert repr(netop) == "NetworkOperation(name='t', needs=[], provides=['sum1'])"
799+
assert repr(netop) == "NetworkOperation('t', needs=[], provides=['sum1'])"
800800

801801

802802
# Function without return value.

0 commit comments

Comments
 (0)