dv-flow-mgr 1.8.14949090112rc0__py3-none-any.whl → 1.9.0__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -31,7 +31,7 @@ from .task_node_ctor_wrapper import task
 from .task_runner import TaskSetRunner
 from .task_listener_log import TaskListenerLog
 
-VERSION="1.8.0"
-SUFFIX="14949090112rc0"
+VERSION="1.9.0"
+SUFFIX=""
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/package_loader.py

@@ -71,29 +71,11 @@ class LoaderScope(SymbolScope):
         # Split the name into elements
         name_elems = name.split('.')
 
-        def find_pkg(pkg_name):
-            pkg = None
-
-            if pkg_name in self.loader._pkg_m.keys():
-                pkg = self.loader._pkg_m[pkg_name]
-            else:
-                path = self.loader.pkg_rgy.findPackagePath(pkg_name)
-                if path is not None:
-                    path = os.path.normpath(path)
-                    pkg = self.loader._loadPackage(path)
-                    self.loader._pkg_m[pkg_name] = pkg
-            if pkg is not None:
-                self._log.debug("Found pkg %s (%s)" % (pkg_name, str(pkg.task_m.keys())))
-            else:
-                self._log.debug("Failed to find pkg %s" % pkg_name)
-            
-            return pkg
-
         if len(name_elems) > 1:
             for i in range(len(name_elems)-1, -1, -1):
                 pkg_name = ".".join(name_elems[:i+1])
 
-                pkg = find_pkg(pkg_name)
+                pkg = self.findPackage(pkg_name)
                 if pkg is not None:
                     break;
 
@@ -125,6 +107,25 @@ class LoaderScope(SymbolScope):
         self._log.debug("<-- findType: %s (%s)" % (name, str(ret)))
 
         return ret
+    
+    def findPackage(self, name) -> Package:
+        pkg = None
+
+        if name in self.loader._pkg_m.keys():
+            pkg = self.loader._pkg_m[name]
+        else:
+            path = self.loader.pkg_rgy.findPackagePath(name)
+            if path is not None:
+                path = os.path.normpath(path)
+                pkg = self.loader._loadPackage(path)
+                self.loader._pkg_m[name] = pkg
+        if pkg is not None:
+            self._log.debug("Found pkg %s (%s)" % (name, str(pkg.task_m.keys())))
+        else:
+            self._log.debug("Failed to find pkg %s" % name)
+            
+        return pkg
+
 
 @dc.dataclass
 class PackageScope(SymbolScope):
@@ -592,7 +593,13 @@ class PackageLoader(object):
                 task.uses = self._findTaskOrType(taskdef.uses)
 
                 if task.uses is None:
-                    self.error("failed to resolve task-uses %s" % taskdef.uses, taskdef.srcinfo)
+                    closest = self.find_closest_name(taskdef.uses)
+                    if closest:
+                        self.error("failed to resolve task-uses %s. Did you mean %s?" % (
+                            taskdef.uses, 
+                            closest), taskdef.srcinfo)
+                    else:
+                        self.error("failed to resolve task-uses %s" % taskdef.uses, taskdef.srcinfo)
                     continue
             
             passthrough, consumes, rundir = self._getPTConsumesRundir(taskdef, task.uses)
@@ -915,3 +922,29 @@ class PackageLoader(object):
     def marker(self, marker):
         for l in self.marker_listeners:
             l(marker)
+
+    def find_closest_name(self, name):
+        import difflib
+
+        # First see if we can find the package
+
+        name_s = set()
+        pkg_s = set()
+        for p in self._pkg_m.values():
+            self._gatherTaskNames(name_s, pkg_s, p)
+
+        closest_matches = difflib.get_close_matches(name, name_s)
+
+        if closest_matches and len(closest_matches) > 0:
+            closest_match = closest_matches[0]
+            self._log.debug("Closest match: %s" % closest_match)
+            return closest_match
+
+    def _gatherTaskNames(self, name_s, pkg_s, pkg):
+        if pkg.name not in pkg_s:
+            pkg_s.add(pkg.name)
+            for t in pkg.task_m.keys():
+                name_s.add(t)
+            for p in pkg.pkg_m.values():
+                self._gatherTaskNames(name_s, pkg_s, p)
+

dv_flow/mgr/std/flow.dv

@@ -120,22 +120,12 @@ package:
           Optional timestamp file to determine if running 
           the command changed the output
 
-  - name: DataItem
-    shell: pytask
-    run: dv_flow.mgr.std.data_item.DataItem
-    doc: |
-      Creates and outputs a data item
-    with:
-      type:
-        type: str
-        value: ""
-      with:
-        type: map
   types:
   - name: DataItem
     with:
       type:
         type: str
+
   - name: FileSet
     uses: std.DataItem
     with:

{dv_flow_mgr-1.8.14949090112rc0.dist-info → dv_flow_mgr-1.9.0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=wpHDLCJIeNyjUPYqoGmaOjhaEp5UYB-kT_J7SnNTcIY,1315
+dv_flow/mgr/__init__.py,sha256=XEEeRw_ZtMVNVh1mpM2XZQWxTclTlRrlh9BLZp09RhE,1301
 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
@@ -20,7 +20,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=L1ba5xguOZWuyg9s4MfafKgSoIka3SgAQzYAmcV7XgQ,4430
 dv_flow/mgr/package_def.py,sha256=1O1SBJATnw-zeYKRNENgw-RWxZK0hxNQhnncfE_NR-U,5674
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=7kI7UFALnnOhz128iiH_Fid9vfNSYAIzhMeQPuA4DJg,33704
+dv_flow/mgr/package_loader.py,sha256=DUNSolfB-9E0KgmCCEjz6ezWm4xlwgPRpWgxcugFEmM,34771
 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
@@ -64,7 +64,7 @@ dv_flow/mgr/std/create_file.py,sha256=SEpKTQdiY32002C7b4kYfAiK9v_xajixOJU5WftW75
 dv_flow/mgr/std/data_item.py,sha256=olKtspEVFOvr92reUl4QaQV27UVyjSGIfIWpsy0Myvo,434
 dv_flow/mgr/std/exec.py,sha256=UChqa_tAjvdB1NjqTsvlPgFomP8hMsX2rAOPyUonNpk,3896
 dv_flow/mgr/std/fileset.py,sha256=_9IUjZ2_doygc29Qg1hJPaFPzlaIaTdvHnYTai8mE3A,4183
-dv_flow/mgr/std/flow.dv,sha256=vizP3u3yU5iyCmsAeVFeIKy2Ikvhol-_NjCYWOcJCOE,4003
+dv_flow/mgr/std/flow.dv,sha256=qT3qlDjo6DMMcPXHLbW6Z0OJOouXupQK3cm_15JxSKI,3786
 dv_flow/mgr/std/incdirs.py,sha256=F0wraOxkRJRkrhsyk9v2YvpquFtcK4ZsMO1G9sgmhmA,588
 dv_flow/mgr/std/message.py,sha256=0JHLErg8whqMLAasG1fumZ2O7R7WNWeNQ9ibJaLDpVY,1029
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
@@ -74,9 +74,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.8.14949090112rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.8.14949090112rc0.dist-info/METADATA,sha256=Lew5QJrG21eRMB0PcivgjtNMIDptjHAUnDlU_lBOPhU,13335
-dv_flow_mgr-1.8.14949090112rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-dv_flow_mgr-1.8.14949090112rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.8.14949090112rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.8.14949090112rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.0.dist-info/METADATA,sha256=1BuEuGg1VHbODzmAwS0AxdWZMJva1UWSsaqHiRSrjFk,13322
+dv_flow_mgr-1.9.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dv_flow_mgr-1.9.0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.0.dist-info/RECORD,,