dv-flow-mgr 1.9.14984445659rc0__py3-none-any.whl → 1.9.15008554401rc0__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="14984445659rc0"
+SUFFIX="15008554401rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/task_graph_builder.py

@@ -896,13 +896,26 @@ class TaskGraphBuilder(object):
         elif isinstance(value, list):
             new_val = []
             for i,elem in enumerate(value):
-                if elem.find("${{") != -1:
-                    if len(self._name_resolution_stack) > 0:
-                        eval.set_name_resolution(self._name_resolution_stack[-1])
-                    resolved = eval.eval(elem)
-                    new_val.append(resolved)
-                else:
-                    new_val.append(elem)
+                if isinstance(elem, str):
+                    if elem.find("${{") != -1:
+                        if len(self._name_resolution_stack) > 0:
+                            eval.set_name_resolution(self._name_resolution_stack[-1])
+                        resolved = eval.eval(elem)
+                        new_val.append(resolved)
+                    else:
+                        new_val.append(elem)
+                elif isinstance(elem, dict):
+                    for k, v in elem.items():
+                        if isinstance(v, str):
+                            if v.find("${{") != -1:
+                                if len(self._name_resolution_stack) > 0:
+                                    eval.set_name_resolution(self._name_resolution_stack[-1])
+                                resolved = eval.eval(v)
+                                new_val.append({k: resolved})
+                            else:
+                                new_val.append({k: v})
+                        else:
+                            new_val.append(elem)
         return new_val
 
     def _gatherNeeds(self, task_t, node):

dv_flow/mgr/task_listener_log.py

@@ -96,13 +96,14 @@ class TaskListenerLog(object):
         else:
             sev_pref = ""
 
+        # Escape anything that looks like a styling marker
+        marker_m = m.msg.replace("[", "\\[")
+
         msg = "  %s%s: %s" % (
             sev_pref,
             (" " + name) if name is not None and name != "" else "",
-            m.msg)
+            marker_m)
         
-        # Escape anything that looks like a styling marker
-        msg = msg.replace("[", "\\[")
 
 
         if m.loc is not None:

{dv_flow_mgr-1.9.14984445659rc0.dist-info → dv_flow_mgr-1.9.15008554401rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=-6xIQMeY8cnLTIa2To7xXMSSvPpXHuUX6NiFj5XUMog,1315
+dv_flow/mgr/__init__.py,sha256=IQiJifqYb3hbXNG5kU7UttJPlhZ31XyFVisfvOypPHo,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
@@ -36,9 +36,9 @@ dv_flow/mgr/task.py,sha256=XQ-mVyDGvpU4gB6GmnNeTQhxKqFXiblShh7qd_-SIbM,2387
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=lhiOL7E_TfW7Ytg5qipE6d2cqTkfVqAOs1MZgtCqeLg,5257
 dv_flow/mgr/task_gen_ctxt.py,sha256=1QQqqgaCjJSlzTV0SASpTb69vINFrDq3aqjYCKUkx3s,846
-dv_flow/mgr/task_graph_builder.py,sha256=pqzazJjA36g-ETuvxfEl6JV6035koJJPqSF_L-Egtgg,32716
+dv_flow/mgr/task_graph_builder.py,sha256=7rg9Vj3aRdaNQymrZpGRLCBUkdaMq80lMikbWxnUaIk,33429
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
-dv_flow/mgr/task_listener_log.py,sha256=5skg1QAp3jmInsjoxI2htul4DKv6ID0T9Z5itk4wudQ,4763
+dv_flow/mgr/task_listener_log.py,sha256=XcmBT-946DyrEYwNwbg7ejnB6Q3koybE7AekSWGxNGQ,4774
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
 dv_flow/mgr/task_node.py,sha256=OC3rkeRSFv9wmgkMZ_7eJu7nuXGJcwW_b6FGQM-w7AU,5231
 dv_flow/mgr/task_node_compound.py,sha256=0biBPT_2SpCPJL7DFaFY27_K7kNxJ1taIut3Fv12HXk,3347
@@ -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.14984445659rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.9.14984445659rc0.dist-info/METADATA,sha256=b3MThxkBzbiwjPJ2n-9_BBAbtJpe5H2qP9wQTsv-too,13335
-dv_flow_mgr-1.9.14984445659rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-dv_flow_mgr-1.9.14984445659rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.9.14984445659rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.9.14984445659rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.15008554401rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.15008554401rc0.dist-info/METADATA,sha256=YCyrhzIrlkcKsaok8nRDRT2kUhH2x5pHrzGVTvKYlwE,13335
+dv_flow_mgr-1.9.15008554401rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dv_flow_mgr-1.9.15008554401rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.15008554401rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.15008554401rc0.dist-info/RECORD,,