dv-flow-mgr 0.0.1.12942385741a1__tar.gz → 0.0.1.12952658757a1__tar.gz

{dv_flow_mgr-0.0.1.12942385741a1 → dv_flow_mgr-0.0.1.12952658757a1}/PKG-INFO

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

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

{dv_flow_mgr-0.0.1.12942385741a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/__init__.py

@@ -1,5 +1,6 @@
 
 from .package_def import *
+from .pkg_rgy import PkgRgy
 from .task_graph_runner import *
 from .task import *
 from .task_data import *

{dv_flow_mgr-0.0.1.12942385741a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -153,7 +153,10 @@ class TaskGraphBuilder(object):
                             pkg = self._pkg_m[tgt_pkg_spec]
                         elif self.pkg_rgy.hasPackage(tgt_pkg_spec.name):
                             base = self.pkg_rgy.getPackage(tgt_pkg_spec.name)
+                            pkg_m = self._pkg_m
+                            self._pkg_m = {}
                             pkg = base.mkPackage(self, spec.params)
+                            self._pkg_m = pkg_m
                             self._pkg_m[spec] = pkg
                         elif imp.path is not None:
                             # See if we can load the package
@@ -172,6 +175,9 @@ class TaskGraphBuilder(object):
                             if base is None:
                                 raise Exception("Failed to find imported package %s" % spec.name)
                             pkg = base.mkPackage(self, spec.params)
+                            pkg_m = self._pkg_m
+                            self._pkg_m = {}
+                            self._pkg_m = pkg_m
                             self._pkg_m[spec] = pkg
                             break
             
@@ -180,7 +186,11 @@ class TaskGraphBuilder(object):
                 p_def =  self.pkg_rgy.getPackage(spec.name)
 
                 if p_def is not None:
+                    pkg_m = self._pkg_m
+                    self._pkg_m = {}
                     pkg = p_def.mkPackage(self)
+                    self._pkg_m = pkg_m
+                    self._pkg_m[spec] = pkg
 
             if pkg is None:
                 raise Exception("Failed to find package %s from package %s" % (

{dv_flow_mgr-0.0.1.12942385741a1 → dv_flow_mgr-0.0.1.12952658757a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12942385741a1
+Version: 0.0.1.12952658757a1
 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.12942385741a1 → dv_flow_mgr-0.0.1.12952658757a1}/tests/sys/test_pkg_discovery.py

@@ -2,6 +2,7 @@ import os
 import pytest
 import subprocess
 import sys
+from dv_flow.mgr import PkgRgy
 
 
 def test_import_specific(tmpdir):
@@ -61,12 +62,12 @@ package:
   name: p1
 
   imports:
-  - name: p2
-    as: p3
+  - name: p2.foo
+    as: p2
 
   tasks:
   - name: my_task
-    uses: p3.doit
+    uses: p2.doit
 """
 
     p2_flow_dv = """
@@ -77,7 +78,18 @@ package:
   - name: doit
     uses: std.Message
     with:
-      msg: "Hello There"
+      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)
@@ -89,6 +101,13 @@ package:
     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
 
@@ -104,5 +123,5 @@ package:
 
     output = output.decode()
 
-    assert output.find("Hello There") != -1
+    assert output.find("Hello There (p2.foo)") != -1