dv-flow-mgr 0.0.1.12942349289a1__tar.gz → 0.0.1.12952658757a1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/PKG-INFO +1 -1
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/pyproject.toml +1 -1
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/__init__.py +1 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/package_def.py +1 -1
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_graph_builder.py +13 -1
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/PKG-INFO +1 -1
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/sys/test_pkg_discovery.py +24 -5
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/.github/workflows/ci.yml +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/.gitignore +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/.vscode/settings.json +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/LICENSE +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/README.md +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/Makefile +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/Notes.md +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/Roadmap.md +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/Stages.md +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/TypesAndDefs.md +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/conf.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/index.rst +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/intro.rst +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/quickstart.rst +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/docs/reference.rst +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/ivpm.yaml +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/setup.cfg +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/__main__.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/cmds/cmd_run.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/fileset.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/fragment_def.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/package.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/package_import_spec.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/pkg_rgy.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/share/flow.json +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/fileset.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/flow.dv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/message.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/task_null.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_data.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_def.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_graph_runner.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_graph_runner_local.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_memento.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/util.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/SOURCES.txt +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/dependency_links.txt +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/entry_points.txt +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/requires.txt +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/top_level.txt +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/examples/example1/example1.flow +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/sys/test_depends.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/__init__.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1/files1/file1_1.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1/files1/file1_2.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1/files2/file2_1.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1/files2/file2_2.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1/flow.dv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1 copy/files1/file1_1.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1 copy/files1/file1_2.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1 copy/files2/file2_1.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1 copy/files2/file2_2.sv +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/fileset/test1 copy/test1.dfs +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj1/proj1.dfs +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj2/proj2.dfs +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj3/proj3.dfs +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_data_merge.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_fileset.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_pyclass.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_smoke copy.sav +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_smoke.py +0 -0
- {dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_stdlib.py +0 -0
@@ -48,8 +48,10 @@ class TaskGraphBuilder(object):
|
|
48
48
|
self._pkg_spec_s.pop()
|
49
49
|
self._pkg_m[PackageSpec(self.root_pkg.name)] = pkg
|
50
50
|
|
51
|
-
def push_package(self, pkg : Package):
|
51
|
+
def push_package(self, pkg : Package, add=False):
|
52
52
|
self._pkg_s.append(pkg)
|
53
|
+
if add:
|
54
|
+
self._pkg_m[PackageSpec(pkg.name, pkg.params)] = pkg
|
53
55
|
|
54
56
|
def pop_package(self, pkg : Package):
|
55
57
|
self._pkg_s.pop()
|
@@ -151,7 +153,10 @@ class TaskGraphBuilder(object):
|
|
151
153
|
pkg = self._pkg_m[tgt_pkg_spec]
|
152
154
|
elif self.pkg_rgy.hasPackage(tgt_pkg_spec.name):
|
153
155
|
base = self.pkg_rgy.getPackage(tgt_pkg_spec.name)
|
156
|
+
pkg_m = self._pkg_m
|
157
|
+
self._pkg_m = {}
|
154
158
|
pkg = base.mkPackage(self, spec.params)
|
159
|
+
self._pkg_m = pkg_m
|
155
160
|
self._pkg_m[spec] = pkg
|
156
161
|
elif imp.path is not None:
|
157
162
|
# See if we can load the package
|
@@ -170,6 +175,9 @@ class TaskGraphBuilder(object):
|
|
170
175
|
if base is None:
|
171
176
|
raise Exception("Failed to find imported package %s" % spec.name)
|
172
177
|
pkg = base.mkPackage(self, spec.params)
|
178
|
+
pkg_m = self._pkg_m
|
179
|
+
self._pkg_m = {}
|
180
|
+
self._pkg_m = pkg_m
|
173
181
|
self._pkg_m[spec] = pkg
|
174
182
|
break
|
175
183
|
|
@@ -178,7 +186,11 @@ class TaskGraphBuilder(object):
|
|
178
186
|
p_def = self.pkg_rgy.getPackage(spec.name)
|
179
187
|
|
180
188
|
if p_def is not None:
|
189
|
+
pkg_m = self._pkg_m
|
190
|
+
self._pkg_m = {}
|
181
191
|
pkg = p_def.mkPackage(self)
|
192
|
+
self._pkg_m = pkg_m
|
193
|
+
self._pkg_m[spec] = pkg
|
182
194
|
|
183
195
|
if pkg is None:
|
184
196
|
raise Exception("Failed to find package %s from package %s" % (
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/sys/test_pkg_discovery.py
RENAMED
@@ -2,6 +2,7 @@ import os
|
|
2
2
|
import pytest
|
3
3
|
import subprocess
|
4
4
|
import sys
|
5
|
+
from dv_flow.mgr import PkgRgy
|
5
6
|
|
6
7
|
|
7
8
|
def test_import_specific(tmpdir):
|
@@ -61,12 +62,12 @@ package:
|
|
61
62
|
name: p1
|
62
63
|
|
63
64
|
imports:
|
64
|
-
- name: p2
|
65
|
-
as:
|
65
|
+
- name: p2.foo
|
66
|
+
as: p2
|
66
67
|
|
67
68
|
tasks:
|
68
69
|
- name: my_task
|
69
|
-
uses:
|
70
|
+
uses: p2.doit
|
70
71
|
"""
|
71
72
|
|
72
73
|
p2_flow_dv = """
|
@@ -77,7 +78,18 @@ package:
|
|
77
78
|
- name: doit
|
78
79
|
uses: std.Message
|
79
80
|
with:
|
80
|
-
msg: "Hello There"
|
81
|
+
msg: "Hello There (p2)"
|
82
|
+
"""
|
83
|
+
|
84
|
+
p2_foo_flow_dv = """
|
85
|
+
package:
|
86
|
+
name: p2.foo
|
87
|
+
|
88
|
+
tasks:
|
89
|
+
- name: doit
|
90
|
+
uses: std.Message
|
91
|
+
with:
|
92
|
+
msg: "Hello There (p2.foo)"
|
81
93
|
"""
|
82
94
|
|
83
95
|
rundir = os.path.join(tmpdir)
|
@@ -89,6 +101,13 @@ package:
|
|
89
101
|
with open(os.path.join(rundir, "p2/flow.dv"), "w") as fp:
|
90
102
|
fp.write(p2_flow_dv)
|
91
103
|
|
104
|
+
with open(os.path.join(rundir, "p2/foo.dv"), "w") as fp:
|
105
|
+
fp.write(p2_foo_flow_dv)
|
106
|
+
|
107
|
+
# pkg_rgy = PkgRgy()
|
108
|
+
# pkg_rgy.registerPackage("p2", os.path.join(rundir, "p2/flow.dv"))
|
109
|
+
# pkg_rgy.registerPackage("p2.foo", os.path.join(rundir, "p2/foo.dv"))
|
110
|
+
|
92
111
|
env = os.environ.copy()
|
93
112
|
env["DV_FLOW_PATH"] = rundir
|
94
113
|
|
@@ -104,5 +123,5 @@ package:
|
|
104
123
|
|
105
124
|
output = output.decode()
|
106
125
|
|
107
|
-
assert output.find("Hello There") != -1
|
126
|
+
assert output.find("Hello There (p2.foo)") != -1
|
108
127
|
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/.github/workflows/ci.yml
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/__main__.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/cmds/cmd_run.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/fileset.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/fragment_def.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/package.py
RENAMED
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/pkg_rgy.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/share/flow.json
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/fileset.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/flow.dv
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/message.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/std/task_null.py
RENAMED
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_data.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_def.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_memento.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/sys/test_depends.py
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj1/proj1.dfs
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj2/proj2.dfs
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/data/proj3/proj3.dfs
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_data_merge.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_fileset.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_pyclass.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_smoke copy.sav
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_smoke.py
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.12942349289a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/unit/test_stdlib.py
RENAMED
File without changes
|