Skip to content

Commit 85e5701

Browse files
committed
REFACT: op.py --> fnop.py
1 parent 30e2b2d commit 85e5701

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

CHANGES.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ v9.0.0.dev2 (30 Jun 2020, @ankostis): JSONP; net, evictions & sfxed fixes; conve
185185
+ DOC(op): table explaining the differences between various dependency attributes of
186186
:class:`.FnOp`.
187187

188-
.. include:: ../../graphtik/op.py
188+
.. include:: ../../graphtik/fnop.py
189189
:start-after: .. dep-attributes-start
190190
:end-before: .. dep-attributes-end
191191

@@ -244,7 +244,7 @@ v8.1.0 (11 May 2020, @ankostis): drop last plan, Rename/Nest, Netop-->Pipeline,
244244
+ FEAT(pipeline): :data:`.NO_RESULT_BUT_SFX` token can cancel regular data but leave
245245
sideffects of a rescheduled op.
246246

247-
+ REFACT: revert module splits and arrive back to :mod:`base.py`, :mod:`op.py` &
247+
+ REFACT: revert module splits and arrive back to :mod:`base.py`, :mod:`fnop.py` &
248248
:mod:`pipeline.py`, to facilitate development with smaller files, but still
249249
with very few import-time dependencies.
250250

@@ -989,8 +989,8 @@ v2.3.0 (24 Nov 2019, @ankostis): Zoomable SVGs & more op jobs
989989

990990
v2.2.0 (20 Nov 2019, @ankostis): enhance OPERATIONS & restruct their modules
991991
============================================================================
992-
+ REFACT(src): split module ``nodes.py`` --> ``op.py`` + `netop.py` and
993-
move :class:`Operation` from ``base.py`` --> ``op.py``, in order to break cycle
992+
+ REFACT(src): split module ``nodes.py`` --> ``fnop.py`` + `netop.py` and
993+
move :class:`Operation` from ``base.py`` --> ``fnop.py``, in order to break cycle
994994
of `base(op) <-- net <-- netop`, and keep utils only in `base.py`.
995995
+ ENH(op): allow Operations WITHOUT any NEEDS.
996996
+ ENH(op): allow Operation FUNCTIONS to return directly Dictionaries.

docs/source/arch.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Architecture
3636

3737
.. autosummary::
3838

39-
graphtik.op.FnOp
39+
graphtik.fnop.FnOp
4040
graphtik.pipeline.Pipeline
4141
graphtik.planning.Network
4242
graphtik.execution.ExecutionPlan
@@ -285,7 +285,7 @@ Architecture
285285

286286
These matchings are affected by `modifier`\s, print-out with `diacritic`\s.
287287

288-
.. include:: ../../graphtik/op.py
288+
.. include:: ../../graphtik/fnop.py
289289
:start-after: .. dep-attributes-start
290290
:end-before: .. dep-attributes-end
291291

docs/source/plotting.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ in :term:`parallel`::
507507
DEBUG === (3C40) Executing pipeline(t), in parallel, on inputs[], according to ExecutionPlan(needs=[], provides=['b'], x2 steps: op1, op2)...
508508
DEBUG +++ (3C40) Parallel batch['op1'] on solution[].
509509
DEBUG +++ (3C40) Executing OpTask(FnOp|(name='op1', needs=[], provides=[sfx: 'b'], fn{}='<lambda>'), sol_keys=[])...
510-
INFO graphtik.op.py:534 Results[sfx: 'b'] contained +1 unknown provides[sfx: 'b']
510+
INFO graphtik.fnop.py:534 Results[sfx: 'b'] contained +1 unknown provides[sfx: 'b']
511511
FnOp|(name='op1', needs=[], provides=[sfx: 'b'], fn{}='<lambda>')
512512
DEBUG ... (3C40) op(op1) completed in 1.406ms.
513513

@@ -517,7 +517,7 @@ in :term:`parallel`::
517517
DEBUG ... cache-hit key: ((), None, None)
518518
DEBUG === (8697) Executing pipeline(t), evicting, on inputs[], according to ExecutionPlan(needs=[], provides=['b'], x3 steps: op1, op2, sfx: 'b')...
519519
DEBUG +++ (8697) Executing OpTask(FnOp(name='op1', needs=[], provides=[sfx: 'b'], fn{}='<lambda>'), sol_keys=[])...
520-
INFO graphtik.op.py:534 Results[sfx: 'b'] contained +1 unknown provides[sfx: 'b']
520+
INFO graphtik.fnop.py:534 Results[sfx: 'b'] contained +1 unknown provides[sfx: 'b']
521521
FnOp(name='op1', needs=[], provides=[sfx: 'b'], fn{}='<lambda>')
522522
DEBUG ... (8697) op(op1) completed in 0.149ms.
523523
DEBUG +++ (8697) Executing OpTask(FnOp(name='op2', needs=[sfx: 'b'], provides=['b'], fn='<lambda>'), sol_keys=[sfx: 'b'])...

docs/source/reference.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ API Reference
55
.. autosummary::
66

77
graphtik
8-
graphtik.op
8+
graphtik.fnop
99
graphtik.pipeline
1010
graphtik.modifier
1111
graphtik.planning
@@ -18,17 +18,17 @@ API Reference
1818
.. graphviz::
1919
GraphtikModuleDependencies.dot
2020

21-
Module: `op`
22-
=====================
21+
Module: `fnop`
22+
==============
2323

24-
.. automodule:: graphtik.op
24+
.. automodule:: graphtik.fnop
2525
:members:
2626
:undoc-members:
2727
:private-members:
2828
:special-members:
2929

3030
Module: `pipeline`
31-
=====================
31+
==================
3232

3333
.. automodule:: graphtik.pipeline
3434
:members:
@@ -37,7 +37,7 @@ Module: `pipeline`
3737
:special-members:
3838

3939
Module: `modifier`
40-
====================
40+
==================
4141

4242
.. automodule:: graphtik.modifier
4343
:members:
@@ -63,14 +63,14 @@ Module: `execution`
6363
:undoc-members:
6464

6565
Module: `plot`
66-
===============
66+
==============
6767

6868
.. automodule:: graphtik.plot
6969
:members:
7070
:undoc-members:
7171

7272
Module: `config`
73-
====================
73+
================
7474

7575
.. automodule:: graphtik.config
7676
:members:
@@ -83,7 +83,7 @@ Module: `base`
8383
:undoc-members:
8484

8585
Module: `sphinxext`
86-
==============================
86+
===================
8787

8888
.. automodule:: graphtik.sphinxext
8989
:members:

graphtik/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
vararg,
2525
varargs,
2626
)
27-
from .op import NO_RESULT, NO_RESULT_BUT_SFX, operation
27+
from .fnop import NO_RESULT, NO_RESULT_BUT_SFX, operation
2828
from .pipeline import NULL_OP, compose
2929

3030
## SEE ALSO: `.plot.active_plotter_plugged()`, `.plot.set_active_plotter()` &
File renamed without changes.

graphtik/pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def __init__(
169169
170170
*Operations may only be added once, ...*
171171
"""
172-
from .op import reparse_operation_data
172+
from .fnop import reparse_operation_data
173173

174174
## Set data asap, for debugging, although `net.withset()` will reset them.
175175
self.name = name

test/test_combine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from graphtik import NULL_OP, compose, operation, sfx, sfxed, vararg
1212
from graphtik.modifier import dep_renamed
13-
from graphtik.op import Operation
13+
from graphtik.fnop import Operation
1414

1515
from .helpers import abspow, addall
1616

test/test_op.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
)
3131
from graphtik.modifier import dep_renamed
3232
from graphtik.planning import yield_ops
33-
from graphtik.op import (
33+
from graphtik.fnop import (
3434
FnOp,
3535
Operation,
3636
as_renames,

test/test_plot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from graphtik import base, compose, planning, operation, plot
1717
from graphtik.modifier import optional
18-
from graphtik.op import PlotArgs
18+
from graphtik.fnop import PlotArgs
1919
from graphtik.pipeline import Pipeline
2020
from graphtik.plot import (
2121
Plotter,

0 commit comments

Comments
 (0)