dv-flow-mgr 1.9.14960994514rc0__py3-none-any.whl → 1.9.14961727636rc0__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -32,6 +32,6 @@ from .task_runner import TaskSetRunner
 from .task_listener_log import TaskListenerLog
 
 VERSION="1.9.0"
-SUFFIX="14960994514rc0"
+SUFFIX="14961727636rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/package_loader.py

@@ -27,6 +27,7 @@ class SymbolScope(object):
     name : str
     task_m : Dict[str,Task] = dc.field(default_factory=dict)
     type_m : Dict[str,Type] = dc.field(default_factory=dict)
+    override_m : Dict[str,Any] = dc.field(default_factory=dict)
 
     def add(self, task, name):
         self.task_m[name] = task
@@ -276,6 +277,16 @@ class PackageLoader(object):
                 ret = scope
                 break
         return ret
+    
+    def push_package_scope(self, pkg):
+        if len(self._pkg_s):
+            # Pull forward the overrides 
+            pkg.override_m = self._pkg_s[-1].override_m.copy()
+        self._pkg_s.append(pkg)
+        pass
+
+    def pop_package_scope(self):
+        self._pkg_s.pop()
 
     def _loadPackage(self, root, exp_pkg_name=None) -> Package:
         if root in self._file_s:
@@ -375,7 +386,8 @@ class PackageLoader(object):
                 pkg_scope.pkg.pkg_m[pkg.name] = pkg
 
             self._pkg_m[pkg.name] = pkg
-            self._pkg_s.append(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+            self.push_package_scope(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+
             # Imports are loaded first
             self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
 
@@ -387,7 +399,7 @@ class PackageLoader(object):
             self._loadTypes(pkg, typedefs)
             self._loadTasks(pkg, taskdefs, pkg.basedir)
 
-            self._pkg_s.pop()
+            self.pop_package_scope()
 
         self._log.debug("<-- _mkPackage %s (%s)" % (pkg_def.name, pkg.name))
         return pkg

{dv_flow_mgr-1.9.14960994514rc0.dist-info → dv_flow_mgr-1.9.14961727636rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.9.14960994514rc0
+Version: 1.9.14961727636rc0
 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-1.9.14960994514rc0.dist-info → dv_flow_mgr-1.9.14961727636rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=rrgP6VRo_ZaomShkYYncWAMoUHqMTseK1mKomWt7zDc,1315
+dv_flow/mgr/__init__.py,sha256=Ucn1nIpMIGDuGOKhjnp-cRo3rPlcQsDDaqdPGZ9MJTE,1315
 dv_flow/mgr/__main__.py,sha256=BogNdBkXhgg05E8_IumNkVoag6WwvfbpiI8346oOtPo,3844
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -21,7 +21,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=L1ba5xguOZWuyg9s4MfafKgSoIka3SgAQzYAmcV7XgQ,4430
 dv_flow/mgr/package_def.py,sha256=1O1SBJATnw-zeYKRNENgw-RWxZK0hxNQhnncfE_NR-U,5674
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=jfZj1TuYWmuSEVT8Yon8bC0GWJtdynWwugbgZEJsQKY,35389
+dv_flow/mgr/package_loader.py,sha256=okJM0AE8jF8CmV8Tdfd8zpILzbwqrVI5NwqofZQTPaM,35749
 dv_flow/mgr/package_node.py,sha256=CccD2ECiIXy9JBkRR3c7qDxeBiLiPbRT9CqR-Al_niI,214
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=9uO-7UI4OotYixQBo8Nwb2o8FQRFxxJylYCZm9rjt48,1917
@@ -76,9 +76,9 @@ dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
 dv_flow/mgr/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
-dv_flow_mgr-1.9.14960994514rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.9.14960994514rc0.dist-info/METADATA,sha256=dyvqC49RYtsFFrDxcmaUsRwcqRkmFpEsBomitexCeEM,13335
-dv_flow_mgr-1.9.14960994514rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-dv_flow_mgr-1.9.14960994514rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.9.14960994514rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.9.14960994514rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.14961727636rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.14961727636rc0.dist-info/METADATA,sha256=GFXHemv_yeXsmXFxUn1cEZuTDOLhiMj6c_StL2Wibgg,13335
+dv_flow_mgr-1.9.14961727636rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dv_flow_mgr-1.9.14961727636rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.14961727636rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.14961727636rc0.dist-info/RECORD,,