dv-flow-mgr 1.10.15546818223rc0__py3-none-any.whl → 1.10.15799064162rc0__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.10.0"
-SUFFIX="15546818223rc0"
+SUFFIX="15799064162rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/package_loader.py

@@ -11,6 +11,7 @@ from .fragment_def import FragmentDef
 from .package_def import PackageDef
 from .package import Package
 from .param_def import ComplexType
+from .param_ref_eval import ParamRefEval
 from .ext_rgy import ExtRgy
 from .srcinfo import SrcInfo
 from .task import Task, Strategy, StrategyGenerate
@@ -231,6 +232,7 @@ class PackageLoader(object):
     _pkg_s : List[PackageScope] = dc.field(default_factory=list)
     _pkg_m : Dict[str, Package] = dc.field(default_factory=dict)
     _pkg_path_m : Dict[str, Package] = dc.field(default_factory=dict)
+    _eval : ParamRefEval = dc.field(default_factory=ParamRefEval)
     _loader_scope : LoaderScope = None
 
     def __post_init__(self):
@@ -240,6 +242,8 @@ class PackageLoader(object):
         if self.env is None:
             self.env = os.environ.copy()
 
+        self._eval.set("env", self.env)
+
         self._loader_scope = LoaderScope(name=None, loader=self)
 
     def load(self, root) -> Package:
@@ -438,6 +442,10 @@ class PackageLoader(object):
         
         self._log.info("Loading imported package %s" % imp_path)
 
+        if "${{" in imp_path:
+            imp_path = self._eval.eval(imp_path)
+            self._log.info("Import path with expansion: %s" % imp_path)
+
         if not os.path.isabs(imp_path):
             for root in (basedir, os.path.dirname(self._file_s[0])):
                 self._log.debug("Search basedir: %s ; imp_path: %s" % (root, imp_path))
@@ -448,6 +456,10 @@ class PackageLoader(object):
                     self._log.debug("Found root file: %s" % resolved_path)
                     imp_path = resolved_path
                     break
+        else:
+            # absolute path. 
+            if os.path.isdir(imp_path):
+                imp_path = self._findFlowDvInDir(imp_path)
 
         if not os.path.isfile(imp_path):
             self.error("Import file %s not found" % imp_path, pkg.srcinfo)
@@ -466,11 +478,18 @@ class PackageLoader(object):
         pkg.pkg_m[sub_pkg.name] = sub_pkg
         self._log.debug("<-- _loadPackageImport %s" % str(imp))
 
-    def _findFlowDvInDir(self, base, leaf):
+    def _findFlowDvInDir(self, base, leaf=None):
         """Search down the tree looking for a flow.dv file"""
         self._log.debug("--> _findFlowDvInDir (%s, %s)" % (base, leaf))
         imp_path = None
-        if os.path.isfile(os.path.join(base, leaf)):
+        if leaf is None:
+            if os.path.isfile(base):
+                imp_path = base
+            elif os.path.isfile(os.path.join(base, "flow.dv")):
+                imp_path = os.path.join(base, "flow.dv")
+            elif os.path.isdir(base):
+                imp_path = self._findFlowDvSubdir(base)
+        elif os.path.isfile(os.path.join(base, leaf)):
             imp_path = os.path.join(base, leaf)
             self._log.debug("Found: %s" % imp_path)
         elif os.path.isdir(os.path.join(base, leaf)):

{dv_flow_mgr-1.10.15546818223rc0.dist-info → dv_flow_mgr-1.10.15799064162rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=FLH25pZ7BCcqKMfK3iZ0xyJQZ28wy31JyJEJWbA_XvE,1316
+dv_flow/mgr/__init__.py,sha256=-Rxl87S-OTMqrTBPkNDIXMWxmME8gdtHe24Ddcw07fc,1316
 dv_flow/mgr/__main__.py,sha256=yrNrvz-jYEovBGpY1E9aS1iZ9S_9MQv0lT-XUQSp0vc,4141
 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=oKzYQypF-to4OXr8BKwPz7Z8cf7AC6eF6CiYj1jCyTI,4585
 dv_flow/mgr/package_def.py,sha256=h3_FIKQB0vqfcu1jRAZuB8W8Kozr62oaKNchxeNjpWk,5898
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=okXcF5EqgvKMHSCsEpMtpejhBmnE-QaUDoV4C1yNmdA,35750
+dv_flow/mgr/package_loader.py,sha256=4fFNuZ-BDzkM1KeYhCM2VM3DLsLnea3L2f2JrUv8US4,36509
 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=GnaolV5QOrjBpqNj9yYo9nnrwEBpp4J_4ZYe14bsfO4,1939
@@ -76,9 +76,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=Ob2RTJOhanWajatiWJYm2ixuzspVx9hPFjGaaw0oPRI,1924
 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-1.10.15546818223rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.10.15546818223rc0.dist-info/METADATA,sha256=Hqaghk9RDnIFdKzSbHxKmuxsqXeZUHWO2bW-6Gh2oDg,13336
-dv_flow_mgr-1.10.15546818223rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.10.15546818223rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.10.15546818223rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.10.15546818223rc0.dist-info/RECORD,,
+dv_flow_mgr-1.10.15799064162rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.10.15799064162rc0.dist-info/METADATA,sha256=pW0HnBLlhHLkWa81qnWi5SzIgJVLDQUHqnrYBG7bUIo,13336
+dv_flow_mgr-1.10.15799064162rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.10.15799064162rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.10.15799064162rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.10.15799064162rc0.dist-info/RECORD,,