dv-flow-mgr 0.0.1.12941329363a1__py3-none-any.whl → 0.0.1.12941908886a1__py3-none-any.whl

dv_flow/mgr/std/fileset.py

@@ -25,21 +25,21 @@ class FileSet(Task):
 
         if self.params is not None:
             glob_root = os.path.join(self.srcdir, self.params.base)
+            glob_root = glob_root.strip()
 
-            print("glob_root: %s" % glob_root)
+            if glob_root[-1] == '/' or glob_root == '\\':
+                glob_root = glob_root[:-1]
 
             fs = _FileSet(
                 src=self.name, 
                 type=self.params.type,
                 basedir=glob_root)
-            print("glob_root: %s" % glob_root)
 
             if not isinstance(self.params.include, list):
                 self.params.include = [self.params.include]
 
             included_files = []
             for pattern in self.params.include:
-                print("pattern: %s" % pattern)
                 included_files.extend(glob.glob(os.path.join(glob_root, pattern), recursive=False))
 
             for file in included_files:

{dv_flow_mgr-0.0.1.12941329363a1.dist-info → dv_flow_mgr-0.0.1.12941908886a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12941329363a1
+Version: 0.0.1.12941908886a1
 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.12941329363a1.dist-info → dv_flow_mgr-0.0.1.12941908886a1.dist-info}/RECORD

@@ -16,14 +16,13 @@ dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1
 dv_flow/mgr/util.py,sha256=06eVyURF4ga-s8C9Sd3ZSDebwO4QS0XXaB8xADVbWRc,1437
 dv_flow/mgr/cmds/cmd_run.py,sha256=C1bd2yZxVU03hZizGLYoH1JfZgeq_G57Kajc279iZpo,2773
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
-dv_flow/mgr/std/fileset.py,sha256=qY4RMqTHZaFZk68Y3oXtDv2_Ezu1r4wYvaRvr0GTyIY,2352
+dv_flow/mgr/std/fileset.py,sha256=0eBp0VIkxYbIYAt0YJg0m-6nUbPuzGkaVBtxpius7Cg,2354
 dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
-dv_flow/mgr/std/task_fileset.py,sha256=UzTYONvK0X9rgy3rP9LiX4giBU8SyCCJav0LSNUJ1Qg,3140
 dv_flow/mgr/std/task_null.py,sha256=UEJ3fIoIMYWVsagiQC7GHD23UES7WoH4wtq94b4tcs4,265
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/METADATA,sha256=xuwb28g214WYwODgXHPicVVFvDj2Ct4TczlbOeDIuG8,13276
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12941329363a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/METADATA,sha256=oj0DrmZVD70UnBb5Eg4omJaMR9hZobOvR7Od_dNug0I,13276
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.12941908886a1.dist-info/RECORD,,

dv_flow/mgr/std/task_fileset.py

@@ -1,90 +0,0 @@
-import os
-import glob
-import fnmatch
-import pydantic.dataclasses as dc
-from ..fileset import FileSet
-from ..package import TaskCtor
-from ..task import Task, TaskParams
-from ..task_data import TaskData
-from ..task_memento import TaskMemento
-from typing import List, Tuple
-
-class TaskFileSet(Task):
-
-    async def run(self, input : TaskData) -> TaskData:
-        print("TaskFileSet run: %s: basedir=%s, base=%s type=%s include=%s" % (
-            self.name,
-            self.basedir,
-            self.params.base, self.params.type, str(self.params.include)
-        ))
-
-        glob_root = os.path.join(self.basedir, self.params.base)
-
-        ex_memento = self.getMemento(TaskFileSetMemento)
-
-        fs = FileSet(
-            src=self.name, 
-            type=self.params.type,
-            basedir=glob_root)
-        print("glob_root: %s" % glob_root)
-
-        if not isinstance(self.params.include, list):
-            self.params.include = [self.params.include]
-
-        included_files = []
-        for pattern in self.params.include:
-            print("pattern: %s" % pattern)
-            included_files.extend(glob.glob(os.path.join(glob_root, pattern), recursive=False))
-
-        memento = TaskFileSetMemento()
-        for file in included_files:
-            if not any(glob.fnmatch.fnmatch(file, os.path.join(glob_root, pattern)) for pattern in self.params.exclude):
-                memento.files.append((file, os.path.getmtime(os.path.join(glob_root, file))))
-                fs.files.append(file[len(glob_root):])
-
-        # Check to see if the filelist or fileset have changed
-        # Only bother doing this if the upstream task data has not changed
-        if ex_memento is not None and not input.changed:
-            ex_memento.files.sort(key=lambda x: x[0])
-            memento.files.sort(key=lambda x: x[0])
-            input.changed = ex_memento != memento
-        else:
-            input.changed = True
-
-        self.setMemento(memento)
-
-        input.addFileSet(fs)
-        return input
-
-class TaskFileSetParams(TaskParams):
-    base : str = ""
-    type : str = "Unknown"
-    include : List[str] = dc.Field(default_factory=list)
-    exclude : List[str] = dc.Field(default_factory=list)
-
-class TaskFileSetMemento(TaskMemento):
-    files : List[Tuple[str,float]] = dc.Field(default_factory=list)
-
-class TaskFileSetCtor(TaskCtor):
-
-    def mkTaskParams(self) -> TaskParams:
-        return TaskFileSetParams()
-    
-    def setTaskParams(self, params : TaskParams, pvals : dict):
-        for p in pvals.keys():
-            if not hasattr(params, p):
-                raise Exception("Unsupported parameter: " + p)
-            else:
-                setattr(params, p, pvals[p])
-
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : TaskParams, depends : List['Task']) -> 'Task':
-        task = TaskFileSet(
-            name=name, 
-            task_id=task_id, 
-            session=session, 
-            params=params,
-            basedir=os.path.dirname(os.path.abspath(__file__)),
-            srcdir=os.path.dirname(os.path.abspath(__file__)))
-        task.depends.extend(depends)
-        return task
-