lint

project.py

@@ -55,8 +55,8 @@ def fetch_file(url, filename):
     return True
 
 
-def fetch_wokwi_file(wokwi_id:int, file_requested:str, 
+def fetch_wokwi_file(wokwi_id: int, file_requested: str,
-                     destination_name:str = None):
+                     destination_name: str = None):
     '''
         fetch_wokwi_file -- perform a request on the wokwi api to
                             retrieve a file from a given project.
@@ -73,16 +73,14 @@ def fetch_wokwi_file(wokwi_id:int, file_requested:str,
     return fetch_file(url, destination_name)
 
 
-def install_wokwi_testing(wokwi_id:int, destination_dir:str='src', 
+def install_wokwi_testing(wokwi_id: int, destination_dir: str = 'src',
-                          resource_dir:str=None):
+                          resource_dir: str = None):
 
     wokwi_id_str = str(wokwi_id)
-    #wokwi_user_module = f'user_module_{wokwi_'
 
     if resource_dir is None or not len(resource_dir):
         resource_dir = os.path.join(os.path.dirname(__file__), 'testing')
 
-        
     # directories in testing/lib to copy over
     pyLibsDir = os.path.join(resource_dir, 'lib')
 
@@ -96,9 +94,6 @@ def install_wokwi_testing(wokwi_id:int, destination_dir:str='src',
             os.path.join(destination_dir, os.path.basename(libfullpath)),
             dirs_exist_ok=True)
 
-        
-    
-    
     for srcTemplate in glob.glob(os.path.join(srcTplDir, '*')):
         with open(srcTemplate, 'r') as f:
             contents = f.read()
@@ -110,11 +105,6 @@ def install_wokwi_testing(wokwi_id:int, destination_dir:str='src',
                 outf.close()
 
 
-            
-            
-        
-    
-        
 def get_project_source(yaml):
     # wokwi_id must be an int or 0
     try:
@@ -126,26 +116,20 @@ def get_project_source(yaml):
     # it's a wokwi project
     if wokwi_id != 0:
         src_file = f'user_module_{wokwi_id}.v'
-        if not fetch_wokwi_file(wokwi_id, 'verilog', 
+        if not fetch_wokwi_file(wokwi_id, 'verilog', os.path.join("src", src_file)):
-                         os.path.join("src", src_file) ):
             logging.error(f'Could not fetch verilog file for wokwi project {wokwi_id}')
             exit(1)
 
-
         # also fetch the wokwi diagram
-        if not fetch_wokwi_file(wokwi_id, 'diagram.json', 
+        if not fetch_wokwi_file(wokwi_id, 'diagram.json', os.path.join("src", 'wokwi_diagram.json')):
-                            os.path.join("src", 'wokwi_diagram.json')):
             logging.error(f'Could not fetch diagram.json file for wokwi project {wokwi_id}')
             exit(1)
 
-        
         # attempt to download the *optional* truthtable for the project
-        if fetch_wokwi_file(wokwi_id, 'truthtable.md', 
+        if fetch_wokwi_file(wokwi_id, 'truthtable.md', os.path.join('src', 'truthtable.md')):
-                            os.path.join('src', 'truthtable.md')):
             logging.info(f'Wokwi project {wokwi_id} has a truthtable included, will test!')
             install_wokwi_testing(wokwi_id)
 
-        
         return [src_file, 'cells.v']
 
     # else it's HDL, so check source files

tt_tool.py

@@ -63,7 +63,7 @@ if __name__ == '__main__':
     if args.print_warnings:
         reports.print_warnings(args)
 
-    elif args.print_wokwi_id:
+    if args.print_wokwi_id:
         project.print_wokwi_id(project_yaml)
 
     if args.create_user_config: