dv-flow-mgr 0.0.1.13711323919a1__py3-none-any.whl → 0.0.1.13711429869a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -138,6 +138,7 @@ class PackageDef(BaseModel):
         passthrough = task.passthrough
         consumes = task.consumes
         needs = [] if task.needs is None else task.needs.copy()
+        fullname = self.name + "." + task.name
 
         if task.uses is not None:
             self._log.debug("Uses: %s" % task.uses)
@@ -178,7 +179,7 @@ class PackageDef(BaseModel):
         
         if callable is not None:
             ctor_t = TaskNodeCtorTask(
-                name=task.name,
+                name=fullname,
                 srcdir=srcdir,
                 paramT=paramT, # TODO: need to determine the parameter type
                 passthrough=passthrough,
@@ -188,7 +189,7 @@ class PackageDef(BaseModel):
         elif base_ctor_t is not None:
             # Use the existing (base) to create the implementation
             ctor_t = TaskNodeCtorProxy(
-                name=task.name,
+                name=fullname,
                 srcdir=srcdir,
                 paramT=paramT, # TODO: need to determine the parameter type
                 passthrough=passthrough,
@@ -198,7 +199,7 @@ class PackageDef(BaseModel):
         else:
             self._log.debug("Use 'Null' as the class implementation")
             ctor_t = TaskNodeCtorTask(
-                name=task.name,
+                name=fullname,
                 srcdir=srcdir,
                 paramT=paramT,
                 passthrough=passthrough,
@@ -342,6 +343,8 @@ class PackageDef(BaseModel):
             if not os.path.isabs(imp_path):
                 cls._log.debug("basedir: %s ; imp_path: %s" % (pkg.basedir, imp_path))
                 imp_path = os.path.join(pkg.basedir, imp_path)
+            if os.path.isdir(imp_path) and os.path.isfile(os.path.join(imp_path, "flow.dv")):
+                imp_path = os.path.join(imp_path, "flow.dv")
             if not os.path.isfile(imp_path):
                 raise Exception("Import file %s not found" % imp_path)
 

{dv_flow_mgr-0.0.1.13711323919a1.dist-info → dv_flow_mgr-0.0.1.13711429869a1.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ dv_flow/mgr/fileset.py,sha256=_EhtqBVn0prylXJhR3dUV2p7ocGHzNAF_ZtYNgeKJhs,1240
 dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=878twhPD-E1pFlDNUtuyeFEgJ_Y89b560og4St-Iwrs,1679
-dv_flow/mgr/package_def.py,sha256=NQlXqdGoqIEFDHbO-A4tDEc_JF3m4fdBgKOjwh6J7jA,16034
+dv_flow/mgr/package_def.py,sha256=fim_63ZXubCHBVW7FgKMAOsIiC-HknsGnJLOsOS9FmE,16233
 dv_flow/mgr/package_import_spec.py,sha256=K5bwbO82A7MB5WeR7kmzWk7wQmQbQVMG1BOtpSPKQRU,1755
 dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
@@ -39,9 +39,9 @@ dv_flow/mgr/std/fileset.py,sha256=69cgah6jmRNGmFaLZKpMUaxVSaQ5DxtrqshhQwXhO54,29
 dv_flow/mgr/std/flow.dv,sha256=DpDTrRBfbIt4cJKLHqk_l6_nPkeFDKLVa5Ic4FZodNM,1587
 dv_flow/mgr/std/message.py,sha256=T8Ye44784rD6CT2qIAP5SD7sKPdAlGMFimc4IaPCxxE,200
 dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/METADATA,sha256=Cvh0TWgztkYp9dPFbbkrfmLSQ4KgbQ21DBdnppeSk1g,13314
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13711323919a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/METADATA,sha256=7xtyNO0c8cRx_iG4magazFp_IFzFI5wA58ayuENp3OI,13314
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13711429869a1.dist-info/RECORD,,