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

dv_flow/mgr/exec_callable.py

@@ -10,6 +10,7 @@ from .task_data import TaskDataResult
 @dc.dataclass
 class ExecCallable(object):
     body : str
+    shell: str = "pytask"
     _log : ClassVar = logging.getLogger("ExecCallable")
 
     async def __call__(self, ctxt, input):

dv_flow/mgr/ext_rgy.py

@@ -98,6 +98,9 @@ class ExtRgy(object):
 
         # Register built-in shells
         self._shell_m["shell"] = ShellCallable
+        self._shell_m["bash"] = ShellCallable
+        self._shell_m["csh"] = ShellCallable
+        self._shell_m["tcsh"] = ShellCallable
         self._shell_m["pytask"] = ExecCallable
 
 

dv_flow/mgr/package_loader.py

@@ -225,6 +225,7 @@ class PackageScope(SymbolScope):
 class PackageLoader(object):
     pkg_rgy : ExtRgy = dc.field(default=None)
     marker_listeners : List[Callable] = dc.field(default_factory=list)
+    env : Dict[str, str] = dc.field(default=None)
     _log : ClassVar = logging.getLogger("PackageLoader")
     _file_s : List[str] = dc.field(default_factory=list)
     _pkg_s : List[PackageScope] = dc.field(default_factory=list)
@@ -236,6 +237,9 @@ class PackageLoader(object):
         if self.pkg_rgy is None:
             self.pkg_rgy = ExtRgy.inst()
 
+        if self.env is None:
+            self.env = os.environ.copy()
+
         self._loader_scope = LoaderScope(name=None, loader=self)
 
     def load(self, root) -> Package:

dv_flow/mgr/shell_callable.py

@@ -1,5 +1,7 @@
+import asyncio
 import dataclasses as dc
 import logging
+import os
 from typing import ClassVar, List
 from .task_data import TaskDataResult
 
@@ -10,5 +12,29 @@ class ShellCallable(object):
     _log : ClassVar = logging.getLogger("ShellCallable")
 
     async def __call__(self, ctxt, input):
-        pass
+
+        shell = ("/bin/%s" % self.shell) if self.shell != "shell" else "/bin/sh"
+        # Setup environment for the call
+        env = ctxt.env.copy()
+        env["TASK_SRCDIR"] = input.srcdir
+        env["TASK_RUNDIR"] = input.rundir
+#        env["TASK_PARAMS"] = input.params.dumpto_json()
+        fp = open(os.path.join(input.rundir, "%s.log" % input.name), "w")
+
+        proc = await asyncio.create_subprocess_shell(
+            self.body,
+            shell=self.shell,
+            env=env,
+            cwd=input.rundir,
+            stdout=fp,
+            stderr=asyncio.subprocess.STDOUT)
+        
+        status = await proc.wait()
+        
+        fp.close()
+
+        return TaskDataResult(
+            status=status
+        )
+
 

dv_flow/mgr/task_graph_builder.py

@@ -67,6 +67,7 @@ class TaskGraphBuilder(object):
     rundir : str
     loader : PackageLoader = None
     marker_l : Callable = lambda *args, **kwargs: None
+    env : Dict[str, str] = dc.field(default=None)
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
     _pkg_params_m : Dict[str,Any] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
@@ -94,7 +95,10 @@ class TaskGraphBuilder(object):
         self._shell_m.update(ExtRgy.inst()._shell_m)
         self._task_rundir_s.append([self.rundir])
 
-        self._eval.set("env", os.environ)
+        if self.env is None:
+            self.env = os.environ.copy()
+
+        self._eval.set("env", self.env)
 
 
 
@@ -104,7 +108,8 @@ class TaskGraphBuilder(object):
 
             self._ctxt = TaskNodeCtxt(
                 root_pkgdir=self.root_pkg.basedir,
-                root_rundir=self.rundir)
+                root_rundir=self.rundir,
+                env=self.env)
 
             self._eval.set("root", {
                 "dir": self.root_pkg.basedir
@@ -690,7 +695,7 @@ class TaskGraphBuilder(object):
             shell = task.shell if task.shell is not None else "shell"
             if shell in self._shell_m.keys():
                 self._log.debug("Use shell implementation")
-                callable = self._shell_m[shell](task.run)
+                callable = self._shell_m[shell](task.run, task.shell)
             else:
                 raise Exception("Shell %s not found" % shell)
             

dv_flow/mgr/task_node_ctxt.py

@@ -1,7 +1,9 @@
 import dataclasses as dc
+from typing import Dict
 
 @dc.dataclass
 class TaskNodeCtxt(object):
     """Holds data shared with all task-graph nodes"""
     root_pkgdir : str
     root_rundir : str
+    env : Dict

dv_flow/mgr/task_run_ctxt.py

@@ -3,7 +3,7 @@ import dataclasses as dc
 from pydantic import BaseModel
 import pydantic.dataclasses as pdc
 import os
-from typing import List
+from typing import Dict, List
 from .task_data import TaskMarker, SeverityE, TaskMarkerLoc
 from .task_node_ctxt import TaskNodeCtxt
 
@@ -28,6 +28,10 @@ class TaskRunCtxt(object):
     def root_rundir(self):
         return self.ctxt.root_rundir
     
+    @property
+    def env(self):
+        return self.ctxt.env if self.ctxt is not None else os.environ
+    
     def mkDataItem(self, type, **kwargs):
         """
         Create a data item in the task's rundir. The data item will be
@@ -66,6 +70,9 @@ class TaskRunCtxt(object):
         if logfile is None:
             logfile = "cmd_%d.log" % (self._exec_info.__len__() + 1)
 
+        if env is None:
+            env = self._env
+
         fp = open(os.path.join(self.rundir, logfile), "w")
         proc = await asyncio.create_subprocess_exec(
             *cmd,

dv_flow/mgr/task_runner.py

@@ -34,12 +34,17 @@ from .task_node import TaskNode, RundirE
 @dc.dataclass
 class TaskRunner(object):
     rundir : str
+    env : Dict[str, str] = dc.field(default=None)
 
     # List of [Listener:Callable[Task],Recurisve:bool]
     listeners : List[Tuple[Callable['Task','Reason'], bool]] = dc.field(default_factory=list)
 
     _log : ClassVar = logging.getLogger("TaskRunner")
 
+    def __post_init__(self):
+        if self.env is None:
+            self.env = os.environ.copy()
+
     def add_listener(self, l, recursive=False):
         self.listeners.append((l, recursive))
 
@@ -68,6 +73,7 @@ class TaskSetRunner(TaskRunner):
     _log : ClassVar = logging.getLogger("TaskSetRunner")
 
     def __post_init__(self):
+        super().__post_init__()
         if self.nproc == -1:
             self.nproc = os.cpu_count()
 

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

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

@@ -1,15 +1,15 @@
-dv_flow/mgr/__init__.py,sha256=IQiJifqYb3hbXNG5kU7UttJPlhZ31XyFVisfvOypPHo,1315
+dv_flow/mgr/__init__.py,sha256=wbon6N-qG1wXMKxECf0ccm5tx7GD9nbmDRQCKBZ1WC4,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
 dv_flow/mgr/config_def.py,sha256=N5nBc_2VPrx0pCDyIe-VPhQ7ItnbyJqrak3ZiPEAbtI,1040
 dv_flow/mgr/data_callable.py,sha256=-GeMgBUdUEcdAkWsqvUYcpKqUd5BQsFgi6ARflnp2B8,687
 dv_flow/mgr/eval_jq.py,sha256=bRsHtaN51qIOiZK1VJV52W0-vj5VH0nQ7XIFebZi5kI,1129
-dv_flow/mgr/exec_callable.py,sha256=NbhTVqvrTd-vsTi3cJ3iGrpVe8tfAqxFsSopaNXApRE,3117
+dv_flow/mgr/exec_callable.py,sha256=tB2kBJeBPvq8pYOnZCaCvTYeu_MiezFfHUEqTAW3GQA,3143
 dv_flow/mgr/exec_gen_callable.py,sha256=KLAKgu0c6nrEzfy85qeogH64VOFDBa6anslSBajykOE,3039
 dv_flow/mgr/expr_eval.py,sha256=ojHo3U_QGqm0CWVSEGtFJRo3jrjiTKhy_B58yRNxN8g,4814
 dv_flow/mgr/expr_parser.py,sha256=LMLe4RTbgcQVIpuZIi1vowHsKRgRmzKzomGvlJL8kJI,7110
-dv_flow/mgr/ext_rgy.py,sha256=BeHbTjB6KFcI5xhbl_O00YQW7MQ8efCFTD_Y8xf7I44,5651
+dv_flow/mgr/ext_rgy.py,sha256=UD7nvMF5g3GiSYr7iLbk68_67UwzqUE7vsKCTaFrQr8,5788
 dv_flow/mgr/extend_def.py,sha256=Ndh4z4XqqimtoS8-6ZNMDOvkVpVmEaWZsNEPM26PDZ0,653
 dv_flow/mgr/fileset.py,sha256=kSjz-RiuQdKGMVjmbGK5YlwY-vJKSHmgggu-1_H0DHU,1320
 dv_flow/mgr/fragment_def.py,sha256=2qx6KWiHCDvnb9JXnqIOb4n6kemAClAYuBoM6ex6xJE,1696
@@ -21,7 +21,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=qz17dfKW3csOiACUe4TqrOnd8Z2d_DxYbLmP0OwhKZ8,4580
 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=bYkTXr3PS0xhi3AO8pxvqyNB9RPQRePcy6gUWJOBnvY,34889
+dv_flow/mgr/package_loader.py,sha256=TFvx4bqVXKWoRTopy4Qz8-tSkSsAC5GRK3KMoNTiE9E,35010
 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
@@ -30,13 +30,13 @@ dv_flow/mgr/parser.out,sha256=mWx6hgqORUFhM2OlxV2gp43Y7w3sX2u4ua4t-5wqmck,27566
 dv_flow/mgr/parsetab.py,sha256=S2o2FfobhhVWKwZg_GA7zFg62VwT7tiRxxNZJIyqP98,4351
 dv_flow/mgr/pytask_callable.py,sha256=JiFN2vq6qanI6FXJBeidwiBSn6t0oC0izPJ01c5QJTE,688
 dv_flow/mgr/root_package.py,sha256=nYLOpZVQEDbY0Ui5X5UNeUHXOvqRENew7B2zpC2V2gQ,136
-dv_flow/mgr/shell_callable.py,sha256=IWb0C4L-v_hfnvnhS3g2rhXqutURex_U-dBJgdNxP7I,302
+dv_flow/mgr/shell_callable.py,sha256=2b51yewHTFsoDMAldaB44ZMXkG2LaLR3go0DdM72HEs,1051
 dv_flow/mgr/srcinfo.py,sha256=xrfp-relVr7hYNbxOjY5jqX4H0nNMm9HK5AAM6_Piyk,366
 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=7rg9Vj3aRdaNQymrZpGRLCBUkdaMq80lMikbWxnUaIk,33429
+dv_flow/mgr/task_graph_builder.py,sha256=1uca7YjYAVv1dS5sWk-ztqgdIwJyp9iHkwuzBlwtQPc,33590
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=XcmBT-946DyrEYwNwbg7ejnB6Q3koybE7AekSWGxNGQ,4774
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
@@ -49,12 +49,12 @@ dv_flow/mgr/task_node_ctor_def_base.py,sha256=_8QQHKDkONio_ve0Z409yxC0AMO8ocNBPD
 dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v2PA6VA,1906
 dv_flow/mgr/task_node_ctor_task.py,sha256=d49g90TyPCMFR8BuWWqp4ym-MW5vGSdDR0V47Ru28JY,2232
 dv_flow/mgr/task_node_ctor_wrapper.py,sha256=KMSYd4ik2Si7UXhNMeXAPHBwwrFkuhpeTMeYRpWv0hw,3718
-dv_flow/mgr/task_node_ctxt.py,sha256=dQp68ppFENK0zGo7TKaFXHInPCCsFai1yZwoBKDwJ20,166
+dv_flow/mgr/task_node_ctxt.py,sha256=KHt_kQch6LDq70Oor7z2xbepiiaK2jyp4S-KWZGsRjo,205
 dv_flow/mgr/task_node_leaf.py,sha256=nULlu-veyPC-PXdoQhahkLgqpdKNzaoD0XUlCw0EuZ4,9109
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=qlrzibGAFHmbqOu88jEoh1wOSFHu68Gwdgc259-50e8,1915
-dv_flow/mgr/task_run_ctxt.py,sha256=q88OsuKAHC_GipZ7jBSjbybARsJkgcJhvbKjjj2TweA,3801
-dv_flow/mgr/task_runner.py,sha256=L7wYccjF5c59yeeEc8lHToSlQr68PTNhJgqyeV73MMc,10240
+dv_flow/mgr/task_run_ctxt.py,sha256=Eh-b92NWGDiDw23NmNk-_jWTH5_qaO8FSlwVXN2jI-U,3968
+dv_flow/mgr/task_runner.py,sha256=hfA4eGOmw-Rzur5qgcUKEwQB97Ka5AYv9QPrVZJWHUs,10422
 dv_flow/mgr/type.py,sha256=hoJTatlPC0yOazKSWduK-5CfY38RPkc6qXFzOCcVSdM,723
 dv_flow/mgr/type_def.py,sha256=4sge3PibO1jDnS0cXdX0PiurcKbDA3kT6rb4DGIKwEM,1176
 dv_flow/mgr/yaml_srcinfo_loader.py,sha256=29BNRiB8Hj1FepkrLtdjHSv5U_85Q432gBeeK80nKEA,1606
@@ -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.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,,
+dv_flow_mgr-1.9.15098282600rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.15098282600rc0.dist-info/METADATA,sha256=qr-g-nTWrI_eu7eG-6B99n5QW20iV2R9WlrMttCV3J4,13335
+dv_flow_mgr-1.9.15098282600rc0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+dv_flow_mgr-1.9.15098282600rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.15098282600rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.15098282600rc0.dist-info/RECORD,,

{dv_flow_mgr-1.9.15008554401rc0.dist-info → dv_flow_mgr-1.9.15098282600rc0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any