dv-flow-mgr 0.0.1.12941908886a1__tar.gz → 0.0.1.12942349289a1__tar.gz

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12941908886a1
+Version: 0.0.1.12942349289a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.12941908886a1"
+version = "0.0.1.12942349289a1"
 dependencies = [
     'pydantic',
     'pyyaml',

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/src/dv_flow/mgr/package_def.py

@@ -252,9 +252,6 @@ class PackageDef(BaseModel):
         # else:
         # self._pkg_def_m[PackageSpec(pkg.name)] = pkg
 
-        print("pkg: %s" % str(pkg))
-
-        print("fragments: %s" % str(pkg.fragments))
         for spec in pkg.fragments:
             PackageDef._loadFragmentSpec(pkg, spec, file_s)
 

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -101,7 +101,6 @@ class TaskGraphBuilder(object):
         print("task_ctor=%s" % str(ctor_t.task_ctor), flush=True)
         task = ctor_t.task_ctor(
             name=task_name,
-            session=self,
             params=ctor_t.mkParams(),
             depends=depends,
             rundir=rundir,
@@ -137,10 +136,6 @@ class TaskGraphBuilder(object):
             pkg = self._pkg_s[-1]
         if spec in self._pkg_m.keys():
             pkg = self._pkg_m[spec]
-        elif self.pkg_rgy.hasPackage(spec.name):
-            pkg_def = self.pkg_rgy.getPackage(spec.name)
-            pkg = pkg_def.mkPackage(self)
-            self._pkg_m[spec] = pkg
         else:
             pkg = None
 

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/src/dv_flow/mgr/task_graph_runner_local.py

@@ -96,6 +96,7 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
                                 break
                 if t not in self.done_task_m.keys():
                     task_t = task_m[t]
+                    task_t.session = self
                     coro = asyncio.Task(task_t.do_run())
                     active_task_l.append((task_t, coro))
                

{dv_flow_mgr-0.0.1.12941908886a1 → dv_flow_mgr-0.0.1.12942349289a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12941908886a1
+Version: 0.0.1.12942349289a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

dv_flow_mgr-0.0.1.12942349289a1/tests/sys/test_depends.py

@@ -0,0 +1,143 @@
+import os
+import pytest
+import subprocess
+import sys
+
+def test_seq_1(tmpdir):
+    rundir = os.path.join(tmpdir)
+
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: files
+    uses: std.FileSet
+    with:
+      type: textFiles
+      include: "*.txt"
+
+  - name: print
+    uses: std.Message
+    with:
+      msg: "Running Print"
+"""
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "file.txt"), "w") as fp:
+        fp.write("Hello There\n")
+    
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "print"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Running Print") != -1
+
+def test_seq_2(tmpdir):
+    rundir = os.path.join(tmpdir)
+
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: print1
+    uses: std.Message
+    with:
+      msg: "Running Print 1"
+
+  - name: print
+    uses: std.Message
+    needs: [print1]
+    with:
+      msg: "Running Print 2"
+"""
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "file.txt"), "w") as fp:
+        fp.write("Hello There\n")
+    
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "print"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+    print("Output: %s" % output)
+
+    assert output.find("Running Print 1") != -1
+    assert output.find("Running Print 2") != -1
+
+def test_seq_3(tmpdir):
+    rundir = os.path.join(tmpdir)
+
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: print1
+    uses: std.Message
+    with:
+      msg: "Running Print 1"
+  - name: print2
+    uses: std.Message
+    needs: [print1]
+    with:
+      msg: "Running Print 2"
+  - name: print
+    uses: std.Message
+    needs: [print2]
+    with:
+      msg: "Running Print 3"
+"""
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "file.txt"), "w") as fp:
+        fp.write("Hello There\n")
+    
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "print"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    print("Output: %s" % output)
+
+    assert output.find("Running Print 1") != -1
+    assert output.find("Running Print 2") != -1
+    assert output.find("Running Print 3") != -1

dv_flow_mgr-0.0.1.12941908886a1/tests/sys/test_depends.py

@@ -1,47 +0,0 @@
-import os
-import pytest
-import subprocess
-import sys
-
-def test_seq_1(tmpdir):
-    rundir = os.path.join(tmpdir)
-
-    flow_dv = """
-package:
-  name: p1
-
-  tasks:
-  - name: files
-    uses: std.FileSet
-    with:
-      type: textFiles
-      include: "*.txt"
-
-  - name: print
-    uses: std.Message
-    with:
-      msg: "Running Print"
-"""
-
-    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
-        fp.write(flow_dv)
-    
-    with open(os.path.join(rundir, "file.txt"), "w") as fp:
-        fp.write("Hello There\n")
-    
-    env = os.environ.copy()
-    env["DV_FLOW_PATH"] = rundir
-
-    cmd = [
-        sys.executable,
-        "-m",
-        "dv_flow.mgr",
-        "run",
-        "print"
-    ]
-
-    output = subprocess.check_output(cmd, cwd=rundir, env=env)
-
-    output = output.decode()
-
-    assert output.find("Running Print") != -1