dv-flow-mgr 0.0.1.12960224342a1__tar.gz → 0.0.1.12968982426a1__tar.gz

{dv_flow_mgr-0.0.1.12960224342a1 → dv_flow_mgr-0.0.1.12968982426a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12960224342a1
+Version: 0.0.1.12968982426a1
 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.12960224342a1 → dv_flow_mgr-0.0.1.12968982426a1}/pyproject.toml

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

{dv_flow_mgr-0.0.1.12960224342a1 → dv_flow_mgr-0.0.1.12968982426a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -124,7 +124,7 @@ class TaskGraphBuilder(object):
         self._logger.debug("--> getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))
         if len(self._pkg_spec_s) > 0:
             pkg_spec = self._pkg_spec_s[-1]
-            if self.root_pkg.name == pkg_spec.name:
+            if self.root_pkg is not None and self.root_pkg.name == pkg_spec.name:
                 pkg_def = self.root_pkg
             else:
                 pkg_def = self.pkg_rgy.getPackage(pkg_spec.name)

{dv_flow_mgr-0.0.1.12960224342a1 → dv_flow_mgr-0.0.1.12968982426a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12960224342a1
+Version: 0.0.1.12968982426a1
 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.12960224342a1 → dv_flow_mgr-0.0.1.12968982426a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -46,6 +46,9 @@ src/dv_flow_mgr.egg-info/top_level.txt
 tests/examples/example1/example1.flow
 tests/sys/test_depends.py
 tests/sys/test_pkg_discovery.py
+tests/system/test_depends.py
+tests/system/test_pkg_discovery.py
+tests/system/test_stdlib.py
 tests/unit/__init__.py
 tests/unit/test_data_merge.py
 tests/unit/test_fileset.py

dv_flow_mgr-0.0.1.12968982426a1/tests/system/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.12968982426a1/tests/system/test_pkg_discovery.py

@@ -0,0 +1,201 @@
+import os
+import pytest
+import subprocess
+import sys
+from dv_flow.mgr import PkgRgy
+
+
+def test_import_specific(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  imports:
+  - name: p2
+
+  tasks:
+  - name: my_task
+    uses: p2.doit
+"""
+
+    p2_flow_dv = """
+package:
+  name: p2
+
+  tasks:
+  - name: doit
+    uses: std.Message
+    with:
+      msg: "Hello There"
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    os.makedirs(os.path.join(rundir, "p2"))
+    with open(os.path.join(rundir, "p2/flow.dv"), "w") as fp:
+        fp.write(p2_flow_dv)
+
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "my_task"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Hello There") != -1
+
+
+def test_import_alias(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  imports:
+  - name: p2.foo
+    as: p2
+
+  tasks:
+  - name: my_task
+    uses: p2.doit
+"""
+
+    p2_flow_dv = """
+package:
+  name: p2
+
+  tasks:
+  - name: doit
+    uses: std.Message
+    with:
+      msg: "Hello There (p2)"
+"""
+
+    p2_foo_flow_dv = """
+package:
+  name: p2.foo
+
+  tasks:
+  - name: doit
+    uses: std.Message
+    with:
+      msg: "Hello There (p2.foo)"
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    os.makedirs(os.path.join(rundir, "p2"))
+    with open(os.path.join(rundir, "p2/flow.dv"), "w") as fp:
+        fp.write(p2_flow_dv)
+
+    with open(os.path.join(rundir, "p2/foo.dv"), "w") as fp:
+        fp.write(p2_foo_flow_dv)
+
+#    pkg_rgy = PkgRgy()
+#    pkg_rgy.registerPackage("p2", os.path.join(rundir, "p2/flow.dv"))
+#    pkg_rgy.registerPackage("p2.foo", os.path.join(rundir, "p2/foo.dv"))
+
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "-v",
+        "run",
+        "my_task"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Hello There (p2.foo)") != -1
+
+def test_interface_impl(tmpdir):
+
+    libdir = os.path.join(tmpdir, "lib")
+
+    os.makedirs(libdir)
+    ifc_flow_dv = """
+package:
+  name: ifc
+
+  tasks:
+  - name: T1
+    uses: std.Message
+    with:
+      msg: "T1.Interface"
+"""
+
+    imp_flow_dv = """
+package:
+  name: ifc.imp
+
+  tasks:
+  - name: T1
+    uses: ifc.T1
+    with:
+      msg: "T1.Imp"
+"""
+
+    flow_dv = """
+package:
+  name: foo
+
+  imports:
+  - name: ifc.imp
+    as: ifc
+
+  tasks:
+  - name: Top
+    uses: ifc.T1
+"""
+
+    with open(os.path.join(libdir, "ifc.dv"), "w") as fp:
+        fp.write(ifc_flow_dv)
+    
+    os.makedirs(os.path.join(libdir, "ifc"))
+
+    with open(os.path.join(libdir, "ifc/imp.dv"), "w") as fp:
+        fp.write(imp_flow_dv)
+
+    with open(os.path.join(tmpdir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = libdir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "-d",
+        "run",
+        "Top"
+    ]
+
+    output = subprocess.check_output(
+        cmd, 
+        cwd=os.path.join(tmpdir),
+        env=env)
+
+    output_s = output.decode()
+
+    print("Output: %s" % output_s)
+    assert output_s.find("T1.Imp") != -1
+

dv_flow_mgr-0.0.1.12968982426a1/tests/system/test_stdlib.py

@@ -0,0 +1,6 @@
+
+import os
+import pytest
+import subprocess
+import sys
+