dv-flow-mgr 0.0.2.14150065664a1__tar.gz → 0.0.2.14163613545a1__tar.gz

{dv_flow_mgr-0.0.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14150065664a1
+Version: 0.0.2.14163613545a1
 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.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/pyproject.toml

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

dv_flow_mgr-0.0.2.14163613545a1/src/dv_flow/mgr/listener_list.py

@@ -0,0 +1,10 @@
+import dataclasses as dc
+from typing import List, Callable
+
+@dc.dataclass
+class ListenerList(object):
+    listeners : List[Callable] = dc.field(default_factory=list)
+
+    def __call__(self, *args, **kwargs):
+        for l in self.listeners:
+            l(*args, **kwargs)

{dv_flow_mgr-0.0.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/src/dv_flow/mgr/package_def.py

@@ -64,6 +64,7 @@ class PackageDef(BaseModel):
     params : List[ParamDef] = dc.Field(
         default_factory=list, alias="with",
         description="List of package parameters to set")
+    srcinfo : Any = dc.Field(default=None)
 
     _fragment_l : List['FragmentDef'] = []
     _subpkg_m : Dict[str,'PackageDef'] = {}
@@ -410,13 +411,23 @@ class PackageDef(BaseModel):
 
     @classmethod
     def _loadPkgDef(cls, root, exp_pkg_name, file_s):
+        from yaml.loader import SafeLoader
+
+        class SafeLineLoader(SafeLoader):
+            def construct_mapping(self, node, deep=False):
+#                print("construct")
+                mapping = super(SafeLineLoader, self).construct_mapping(node, deep=deep)
+                # Add 1 so line numbering starts at 1
+#                mapping['_srcinfo'] = node.start_mark.line + 1
+                return mapping
+
         if root in file_s:
             raise Exception("Recursive file processing @ %s: %s" % (root, ",".join(file_s)))
         file_s.append(root)
         ret = None
         with open(root, "r") as fp:
             PackageDef._log.debug("open %s" % root)
-            doc = yaml.load(fp, Loader=yaml.FullLoader)
+            doc = yaml.load(fp, Loader=SafeLineLoader)
             if "package" not in doc.keys():
                 raise Exception("Missing 'package' key in %s" % root)
             try:

{dv_flow_mgr-0.0.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/src/dv_flow/mgr/task_def.py

@@ -19,6 +19,7 @@
 #*     Author: 
 #*
 #****************************************************************************
+import pydantic
 import pydantic.dataclasses as dc
 import enum
 from pydantic import BaseModel
@@ -100,9 +101,12 @@ class TaskDef(BaseModel):
     consumes : Union[ConsumesE, List[Any], None] = dc.Field(
         default=None,
         description="Specifies matching patterns for parameter sets that this task consumes")
-
-#    out: List[TaskOutput] = dc.Field(default_factory=list)
-
+    
+    def __init__(self, **data):
+#        print("--> task_def %s" % str(data))
+        super().__init__(**data)
+#        print("<-- task_def %s" % str(data))
+    
     def copy(self) -> 'TaskDef':
         ret = TaskDef(
             name=self.name,

{dv_flow_mgr-0.0.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -22,6 +22,7 @@
 import os
 import dataclasses as dc
 import logging
+from typing import Callable
 from .package import Package
 from .package_def import PackageDef, PackageSpec
 from .pkg_rgy import PkgRgy
@@ -48,6 +49,7 @@ class TaskGraphBuilder(object):
     root_pkg : PackageDef
     rundir : str
     pkg_rgy : PkgRgy = None
+    marker_l : Callable = lambda *args, **kwargs: None
     _pkg_s : List[Package] = dc.field(default_factory=list)
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
@@ -330,6 +332,7 @@ class TaskGraphBuilder(object):
             self._pkg_spec_s.pop()
             self._pkg_m[spec] = pkg
         else:
+            self.error("Failed to find package %s" % spec.name)
             raise Exception("Failed to find definition of package %s" % spec.name)
 
         self._logger.debug("<-- getPackage: %s" % str(pkg))

{dv_flow_mgr-0.0.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14150065664a1
+Version: 0.0.2.14163613545a1
 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.2.14150065664a1 → dv_flow_mgr-0.0.2.14163613545a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ src/dv_flow/mgr/expr_eval.py
 src/dv_flow/mgr/expr_parser.py
 src/dv_flow/mgr/fileset.py
 src/dv_flow/mgr/fragment_def.py
+src/dv_flow/mgr/listener_list.py
 src/dv_flow/mgr/out
 src/dv_flow/mgr/package.py
 src/dv_flow/mgr/package_def.py