dv-flow-mgr 0.0.1.12942349289a1__py3-none-any.whl → 0.0.1.12952658757a1__py3-none-any.whl

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/package_def.py

@@ -58,7 +58,7 @@ class PackageDef(BaseModel):
     def mkPackage(self, session, params : Dict[str,Any] = None) -> 'Package':
         ret = Package(self.name)
 
-        session.push_package(ret)
+        session.push_package(ret, add=True)
 
         tasks_m : Dict[str,str,TaskCtor]= {}
 

dv_flow/mgr/task_graph_builder.py

@@ -48,8 +48,10 @@ class TaskGraphBuilder(object):
             self._pkg_spec_s.pop()
             self._pkg_m[PackageSpec(self.root_pkg.name)] = pkg
 
-    def push_package(self, pkg : Package):
+    def push_package(self, pkg : Package, add=False):
         self._pkg_s.append(pkg)
+        if add:
+            self._pkg_m[PackageSpec(pkg.name, pkg.params)] = pkg
 
     def pop_package(self, pkg : Package):
         self._pkg_s.pop()
@@ -151,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
@@ -170,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
             
@@ -178,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.12942349289a1.dist-info → dv_flow_mgr-0.0.1.12952658757a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12942349289a1
+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.12942349289a1.dist-info → dv_flow_mgr-0.0.1.12952658757a1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-dv_flow/mgr/__init__.py,sha256=VtQfTiskn-fBaWU18s8odFPMDJ1Lx2DD4Y4Uy5EJ0Qs,261
+dv_flow/mgr/__init__.py,sha256=IZA7I1u7RH34DrJXSkETxWFpK5Jn_A2zXfnCAzJ8XxA,289
 dv_flow/mgr/__main__.py,sha256=big-RSuqbx7P48_8rzaZKX5YW3B2US1i0mRH_TfoeIs,1340
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
 dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1552
 dv_flow/mgr/package.py,sha256=7G_ZQaTHin_mcwQu1PRsGmqfKAbdu9IC5HeLXtPgBDc,1342
-dv_flow/mgr/package_def.py,sha256=gskc2aVQNnuhw_tST-GCQFAVUPvTXhytLWs7sVwXVPk,11342
+dv_flow/mgr/package_def.py,sha256=BWErUHH82dKTT82-dt-Q_Pls8faH9co5EZJLayL5eqo,11352
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
 dv_flow/mgr/pkg_rgy.py,sha256=ej8VyWH8BWdDNVqk3cSJgQq4h3bW1rgj6uCxUr7gfH8,4384
 dv_flow/mgr/task.py,sha256=ewJ7bCFWqwVuzHZZsX2LDZfzXWVFfFlH8yFyn-xxIVg,5043
 dv_flow/mgr/task_data.py,sha256=-6Dqa3oUI7RJc1Js2SRSnhxNTcASkamXFYMN6UiknZQ,10376
 dv_flow/mgr/task_def.py,sha256=96hSwqJo0MazJ1VcLhovYRmNCplsNLt47AumtyjSddU,1690
-dv_flow/mgr/task_graph_builder.py,sha256=_HidvaJp0JuWBuziD_ayeTsC7Iqmb-6aX22vVLLpXjw,7870
+dv_flow/mgr/task_graph_builder.py,sha256=vMT_VOqolaS4sQLVfOLm84Ii3sdI0pRVPwH6iVk68Tc,8405
 dv_flow/mgr/task_graph_runner.py,sha256=NwNYcOJ952lPMLwIIlYE9CoDdedqvcw2fWHYUsKFXuU,2164
 dv_flow/mgr/task_graph_runner_local.py,sha256=UTBV1AKanLns99CSYtEQQ3EEkgo1hM8XsHpc8E5jkIg,4646
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
@@ -20,9 +20,9 @@ dv_flow/mgr/std/fileset.py,sha256=0eBp0VIkxYbIYAt0YJg0m-6nUbPuzGkaVBtxpius7Cg,23
 dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
 dv_flow/mgr/std/task_null.py,sha256=UEJ3fIoIMYWVsagiQC7GHD23UES7WoH4wtq94b4tcs4,265
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/METADATA,sha256=ls1Hg5Or7hKZBnlJQTa6QTGTCrHbnjjDGs_KA3g4INc,13276
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12942349289a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/METADATA,sha256=1o1X3i_PDwt_FRk8r3WlXtFPP0wA5OADxgvg2rTKsdE,13276
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.12952658757a1.dist-info/RECORD,,