dv-flow-mgr 1.10.15799221980rc0__py3-none-any.whl → 1.10.15800610556rc0__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.10.0"
-SUFFIX="15799221980rc0"
+SUFFIX="15800610556rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/package_loader.py

@@ -297,7 +297,7 @@ class PackageLoader(object):
 
     def _loadPackage(self, root, exp_pkg_name=None) -> Package:
         if root in self._file_s:
-            raise Exception("recursive reference")
+            raise Exception("recursive reference to %s" % root)
 
         if root in self._file_s:
             # TODO: should be able to unwind stack here
@@ -450,7 +450,7 @@ class PackageLoader(object):
             for root in (basedir, os.path.dirname(self._file_s[0])):
                 self._log.debug("Search basedir: %s ; imp_path: %s" % (root, imp_path))
 
-                resolved_path = self._findFlowDvInDir(root, imp_path)
+                resolved_path = self._findFlowDvInDir(os.path.join(root, imp_path))
 
                 if resolved_path is not None and os.path.isfile(resolved_path):
                     self._log.debug("Found root file: %s" % resolved_path)
@@ -478,30 +478,20 @@ class PackageLoader(object):
         pkg.pkg_m[sub_pkg.name] = sub_pkg
         self._log.debug("<-- _loadPackageImport %s" % str(imp))
 
-    def _findFlowDvInDir(self, base, leaf=None):
-        """Search down the tree looking for a flow.dv file"""
-        self._log.debug("--> _findFlowDvInDir (%s, %s)" % (base, leaf))
+    def _findFlowDvInDir(self, base):
+        """Search down the tree looking for a <flow.dv> file"""
+        self._log.debug("--> _findFlowDvInDir (%s)" % base)
         imp_path = None
-        for name in ("flow.dv", "flow.yaml", "flow.yml"):
-            if leaf is None:
-                if os.path.isfile(base):
-                    imp_path = base
-                elif os.path.isfile(os.path.join(base, name)):
+        if os.path.isfile(base):
+            imp_path = base
+        else:
+            for name in ("flow.dv", "flow.yaml", "flow.yml"):
+                self._log.debug("Searching for %s in %s" % (name, base))
+                if os.path.isfile(os.path.join(base, name)):
                     imp_path = os.path.join(base, name)
-                elif os.path.isdir(base):
-                    imp_path = self._findFlowDvSubdir(base)
-            elif os.path.isfile(os.path.join(base, leaf)):
-                imp_path = os.path.join(base, leaf)
-                self._log.debug("Found: %s" % imp_path)
-            elif os.path.isdir(os.path.join(base, leaf)):
-                if os.path.isfile(os.path.join(base, leaf, name)):
-                    imp_path = os.path.join(base, leaf, name)
-                    self._log.debug("Found: %s" % imp_path) 
-                else:
-                    imp_path = self._findFlowDvSubdir(os.path.join(base, leaf))
-            if imp_path is not None:
-                self._log.debug("Found: %s" % imp_path)
-                break
+                    break
+            if imp_path is None and os.path.isdir(base):
+                imp_path = self._findFlowDvSubdir(base)
         self._log.debug("<-- _findFlowDvInDir %s" % imp_path)
         return imp_path
     

{dv_flow_mgr-1.10.15799221980rc0.dist-info → dv_flow_mgr-1.10.15800610556rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=ofZc89mZ2Z8he5vLK3xJEdN9Ur4PRgp_JD7uJPvTV4o,1316
+dv_flow/mgr/__init__.py,sha256=LGGJpMvy-J0jDtmr9Z0j6cuf95OmqkvCKu74e9qYGrA,1316
 dv_flow/mgr/__main__.py,sha256=yrNrvz-jYEovBGpY1E9aS1iZ9S_9MQv0lT-XUQSp0vc,4141
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -21,7 +21,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=oKzYQypF-to4OXr8BKwPz7Z8cf7AC6eF6CiYj1jCyTI,4585
 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=z02_buAgOIRtpNxuYgrdaeDxV6PLYcFGsOcElfH9cqM,36860
+dv_flow/mgr/package_loader.py,sha256=bLoVVdAp0cUIJWrSwXkgu8YothjtjIFsbZcINduTl_4,36315
 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=GnaolV5QOrjBpqNj9yYo9nnrwEBpp4J_4ZYe14bsfO4,1939
@@ -77,9 +77,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=5wVWpkHn4U-Hcv-skaLaGC0bgoK63NaF-NH-DGpAaRM,2035
 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-1.10.15799221980rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.10.15799221980rc0.dist-info/METADATA,sha256=P5WbF55tMpkrg6XbrLJAAalWv-EzlaTRh5g0DK5RxmY,13336
-dv_flow_mgr-1.10.15799221980rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.10.15799221980rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.10.15799221980rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.10.15799221980rc0.dist-info/RECORD,,
+dv_flow_mgr-1.10.15800610556rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.10.15800610556rc0.dist-info/METADATA,sha256=vU3peUbzmqG72Uinfu8eQvqd2zD45i4lEPnBETGds6I,13336
+dv_flow_mgr-1.10.15800610556rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.10.15800610556rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.10.15800610556rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.10.15800610556rc0.dist-info/RECORD,,