dv-flow-mgr 0.0.1.13730507343a1__tar.gz → 0.0.1.13755459426a1__tar.gz

{dv_flow_mgr-0.0.1.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13730507343a1
+Version: 0.0.1.13755459426a1
 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.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.13730507343a1"
+version = "0.0.1.13755459426a1"
 dependencies = [
     'jq',
     'pydantic',

dv_flow_mgr-0.0.1.13755459426a1/src/dv_flow/mgr/task_listener_log.py

@@ -0,0 +1,50 @@
+import dataclasses as dc
+from rich.console import Console
+
+@dc.dataclass
+class TaskListenerLog(object):
+    console : Console = dc.field(default_factory=Console)
+    level : int = 0
+    quiet : bool = False
+
+    def event(self, task : 'Task', reason : 'Reason'):
+        if reason == 'enter':
+            self.level += 1
+            if not self.quiet:
+                self.console.print("[green]>[%d][/green] Task %s" % (self.level, task.name))
+        elif reason == 'leave':
+            if self.quiet:
+                if task.result.changed:
+                    self.console.print("[green]Done:[/green] %s" % (task.name,))
+            else:
+                sev_pref_m = {
+                    "info": "[blue]I[/blue]",
+                    "warn": "[yellow]W[/yellow]",
+                    "error": "[red]E[/red]",
+                }
+                for m in task.result.markers:
+                    msg = "  %s %s: %s" % (
+                        sev_pref_m[m.severity], 
+                        task.name,
+                        m.msg)
+
+                    self.console.print(msg)
+
+                    if m.loc is not None:
+                        if m.loc.line != -1 and m.loc.pos != -1:
+                            self.console.print("    %s:%d:%d" % (m.loc.path, m.loc.line, m.loc.pos))
+                        elif m.loc.line != -1:
+                            self.console.print("    %s:%d" % (m.loc.path, m.loc.line))
+                        else:
+                            self.console.print("    %s" % m.loc.path)
+
+                        pass
+                if task.result.status == 0:
+                    self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
+                else:
+                    self.console.print("[red]<[%d][/red] Task %s" % (self.level, task.name))
+            self.level -= 1
+        else:
+            self.console.print("[red]-[/red] Task %s" % task.name)
+        pass
+

{dv_flow_mgr-0.0.1.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/src/dv_flow/mgr/task_node.py

@@ -135,10 +135,12 @@ class TaskNode(object):
                             match = False
                             for k,v in c.items():
                                 self._log.debug("k,v: %s,%s" % (k,v))
-                                if hasattr(out, k) and getattr(out, k) == v:
-                                    self._log.debug("match")
-                                    match = True
-                                    break
+                                if hasattr(out, k):
+                                    self._log.debug("has attribute: %s" % str(getattr(out ,k)))
+                                    if getattr(out, k) == v:
+                                        self._log.debug("match")
+                                        match = True
+                                        break
                             if match:
                                 consumed = True
                                 break

{dv_flow_mgr-0.0.1.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/src/dv_flow/mgr/task_runner.py

@@ -176,6 +176,7 @@ class SingleTaskRunner(TaskRunner):
 #            print("Field: %s" % field.name)
 
         input = TaskDataInput(
+            name=task.name,
             changed=changed,
             srcdir=task.srcdir,
             rundir=self.rundir,

{dv_flow_mgr-0.0.1.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13730507343a1
+Version: 0.0.1.13755459426a1
 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.13730507343a1 → dv_flow_mgr-0.0.1.13755459426a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -78,6 +78,7 @@ tests/unit/test_expr_eval.py
 tests/unit/test_expr_parser.py
 tests/unit/test_fileset.py
 tests/unit/test_imports.py
+tests/unit/test_markers.py
 tests/unit/test_parse.py
 tests/unit/test_pyclass.py
 tests/unit/test_pytask_smoke.py

dv_flow_mgr-0.0.1.13755459426a1/tests/unit/test_markers.py

@@ -0,0 +1,45 @@
+import asyncio
+import pytest
+from typing import List, Union
+import dataclasses as dc
+import pydantic.dataclasses as pdc
+from pydantic import BaseModel
+from dv_flow.mgr.param import Param, ParamT
+from dv_flow.mgr.task import Task
+from dv_flow.mgr.task_data import TaskDataResult, TaskMarker, TaskMarkerLoc
+from dv_flow.mgr.task_node import task as t_decorator
+from dv_flow.mgr.task_node import task
+from dv_flow.mgr.task_runner import SingleTaskRunner, TaskSetRunner
+from dv_flow.mgr.task_listener_log import TaskListenerLog
+
+def test_smoke_1(tmpdir):
+
+    class Params(BaseModel):
+        p1 : str = None
+
+    called = False
+
+    @task(Params)
+    async def MyTask(runner, input):
+            nonlocal called
+            called = True
+            print("Hello from run")
+            return TaskDataResult(
+                 status=1,
+                 markers=[
+                      TaskMarker(msg="testing", severity="info",
+                      loc=TaskMarkerLoc(
+                          path="file1",
+                          line=1,
+                          pos=1
+                      ))
+                 ]
+            )
+
+    task1 = MyTask("task1", srcdir="srcdir", p1="p1")
+    runner = TaskSetRunner("rundir")
+    runner.add_listener(TaskListenerLog().event)
+
+    result = asyncio.run(runner.run(task1))
+
+    assert called

dv_flow_mgr-0.0.1.13730507343a1/src/dv_flow/mgr/task_listener_log.py

@@ -1,27 +0,0 @@
-import dataclasses as dc
-from rich.console import Console
-
-@dc.dataclass
-class TaskListenerLog(object):
-    console : Console = dc.field(default_factory=Console)
-    level : int = 0
-    quiet : bool = False
-
-    def event(self, task : 'Task', reason : 'Reason'):
-        if reason == 'enter':
-            self.level += 1
-            if not self.quiet:
-                self.console.print("[green]>[%d][/green] Task %s" % (self.level, task.name))
-        elif reason == 'leave':
-            for m in task.result.markers:
-                print("  %s" % m)
-            if self.quiet:
-                if task.result.changed:
-                    self.console.print("[green]Done:[/green] %s" % (task.name,))
-            else:
-                self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
-            self.level -= 1
-        else:
-            self.console.print("[red]-[/red] Task %s" % task.name)
-        pass
-