opencos-eda 0.3.3__py3-none-any.whl → 0.3.6__py3-none-any.whl

opencos/util.py

@@ -21,6 +21,7 @@ from dotenv import load_dotenv
 from supports_color import supportsColor
 
 from opencos.utils import status_constants
+from opencos.utils.str_helpers import strip_ansi_color
 
 global_exit_allowed = False # pylint: disable=invalid-name
 progname = "UNKNOWN"        # pylint: disable=invalid-name
@@ -31,6 +32,7 @@ env_files_loaded = set()     # pylint: disable=invalid-name
 
 args = {                    # pylint: disable=invalid-name
     'color' : bool(supportsColor.stdout),
+    'emoji' : bool(getattr(supportsColor.stdout, 'level', 0) >= 2),
     'quiet' : False,
     'verbose' : False,
     'debug' : False,
@@ -43,16 +45,21 @@ args = {                    # pylint: disable=invalid-name
 max_error_code = 0  # pylint: disable=invalid-name
 
 class Colors:
-    '''Namespace class for color printing help'''
+    '''Namespace class for color printing help
+
+    Avoid calling these directly, other than perhapas calling info(*txt, color=Colors.red)
+    with 'color' set. It is preferred for outside callers to use one of the print_<color>(..)
+    functions, or one of info|warning|error|debug
+    '''
     red = "\x1B[31m"
     green = "\x1B[32m"
-    orange = "\x1B[33m"
-    yellow = "\x1B[39m"
+    yellow = "\x1B[33m" # This looks orange, but it's techincally yellow
+    foreground = "\x1B[39m"
     normal = "\x1B[0m"
 
     @staticmethod
     def color_text(text: str, color: str) -> str:
-        '''Wraps 'text' (str) with color (one of red|green|orange|yellow) prefix and
+        '''Wraps 'text' (str) with color (one of red|green|yellow|foreground) prefix and
 
         color (normal) suffix. Disables color prefix/suffix wrapping if args['color']=False
         '''
@@ -60,29 +67,13 @@ class Colors:
             return color + text + "\x1B[0m" # (normal)
         return text
 
-def red_text(text: str) -> str:
-    '''Wraps text for printing as red, disabled if global args['color']=False'''
-    if args['color']:
-        return Colors.red + text + Colors.normal
-    return text
-
-def green_text(text: str) -> str:
-    '''Wraps text for printing as green, disabled if global args['color']=False'''
-    if args['color']:
-        return Colors.green + text + Colors.normal
-    return text
-
-def orange_text(text: str) -> str:
-    '''Wraps text for printing as orange, disabled if global args['color']=False'''
-    if args['color']:
-        return Colors.orange + text + Colors.normal
-    return text
-
-def yellow_text(text: str) -> str:
-    '''Wraps text for printing as yellow, disabled if global args['color']=False'''
-    if args['color']:
-        return Colors.yellow + text + Colors.normal
-    return text
+
+def safe_emoji(emoji: str, default: str = '') -> str:
+    '''Returns emoji character if args['emoji'] is True'''
+    if args['emoji']:
+        return emoji
+    return default
+
 
 class ArtifactTypes(Enum):
     '''Types that are allow-listed for artifacts.add* methods. If you don't use one of
@@ -342,7 +333,7 @@ def get_argparse_bool_action_kwargs() -> dict:
 def get_argparser() -> argparse.ArgumentParser:
     '''Returns the opencos.util ArgumentParser'''
     parser = argparse.ArgumentParser(
-        prog='opencos common options', add_help=False, allow_abbrev=False
+        prog=f'{safe_emoji("🔎 ")}opencos common options', add_help=False, allow_abbrev=False
     )
     # We set allow_abbrev=False so --force-logfile won't try to attempt parsing shorter similarly
     # named args like --force, we want those to go to unparsed list.
@@ -354,6 +345,8 @@ def get_argparser() -> argparse.ArgumentParser:
     parser.add_argument('--version', default=False, action='store_true')
     parser.add_argument('--color', **bool_action_kwargs, default=bool(supportsColor.stdout),
                         help='Use shell colors for info/warning/error messaging')
+    parser.add_argument('--emoji', **bool_action_kwargs, default=args['emoji'],
+                        help=f'Support emojis in terminal{safe_emoji(" 💪")}')
     parser.add_argument('--quiet', **bool_action_kwargs, default=args['quiet'],
                         help='Do not display info messaging')
     parser.add_argument('--verbose', **bool_action_kwargs, default=args['verbose'],
@@ -383,8 +376,10 @@ def get_argparser() -> argparse.ArgumentParser:
                             'Input .f file to be expanded as eda'
                             ' args/defines/incdirs/files/targets'))
     parser.add_argument('--env-file', default=[], action='append',
-                        help='dotenv file(s) to pass ENV vars, (default: .env, loaded last)'
-                        )
+                        help=(
+                            "dotenv file(s) to pass ENV vars, (default: .env loaded first,"
+                            " subsequent files' vars override .env"
+                        ))
     return parser
 
 
@@ -407,12 +402,25 @@ def get_argparser_short_help(parser: object = None) -> str:
     '''Returns short help for our ArgumentParser'''
     if not parser:
         parser = get_argparser()
-    full_lines = parser.format_help().split('\n')
+
+    if not args['color']:
+        # Since python3.14 doesn't care about our custom color settings,
+        # need to remove any ANSI colors from argparse help formatter:
+        full_lines = strip_ansi_color(parser.format_help()).split('\n')
+    else:
+        full_lines = parser.format_help().split('\n')
+
     lineno = 0
     for lineno, line in enumerate(full_lines):
-        if line.startswith('options:'):
+        # Again, strip any ANSI colors when searching for starting text:
+        # - options:
+        # - optional arguments:
+        if args['color']:
+            line = strip_ansi_color(line)
+        if any(line.startswith(x) for x in ('options:', 'optional arguments:')):
             break
-    # skip the line that says 'options:', repalce with the progname:
+
+    # skip the line that says 'options:', replace with the progname:
     return f'{parser.prog}:\n' + '\n'.join(full_lines[lineno + 1:])
 
 
@@ -432,11 +440,12 @@ def process_token(arg: list) -> bool:
 def load_env_file(env_file: str) -> None:
     '''Handles .env file (from util CLI args --env-file)'''
     if os.path.isfile(env_file):
-        load_dotenv(env_file)
+        load_dotenv(env_file, override=True)
         env_files_loaded.add(os.path.abspath(env_file))
     else:
         warning(f'--env-file {env_file} does not exist and is not loaded.')
 
+
 def patch_args_for_dir(tokens: list, patch_dir: str, caller_info: str) -> list:
     '''Given list of args, attempt to correct for relative dir'''
 
@@ -536,8 +545,10 @@ def process_tokens( # pylint: disable=too-many-branches
     parser.add_argument('--debug-level', type=int, default=0,
                         help='Set debug level messaging (default: 0)')
     parser.add_argument('--env-file', default=[], action='append',
-                        help='dotenv file(s) to pass ENV vars, (default: .env, loaded last)'
-                        )
+                        help=(
+                            "dotenv file(s) to pass ENV vars, (default: .env loaded first,"
+                            " subsequent files' vars override .env"
+                        ))
     parser.add_argument('-f', '--input-file', default=[], action='append',
                         help=(
                             'Input .f file to be expanded as eda args, defines, incdirs,'
@@ -553,7 +564,7 @@ def process_tokens( # pylint: disable=too-many-branches
     debug(f'util.process_tokens: {parsed=} {unparsed=} from: {tokens}')
 
     if os.path.isfile(str(Path('.env'))):
-        parsed.env_file.append('.env')
+        parsed.env_file.insert(0, '.env')
     if parsed.env_file:
         for env_file in parsed.env_file:
             load_env_file(env_file)
@@ -718,7 +729,7 @@ def print_post(text: str, end: str) -> None:
 
 
 def print_color(text: str, color: str, end: str = '\n') -> None:
-    '''Note that color(str) must be one of Colors.[red|green|orange|yellow|normal]'''
+    '''Note that color(str) must be one of Colors.[red|green|yellow|normal]'''
     print_pre()
     print(Colors.color_text(text, color), end=end, flush=True)
     print_post(text, end)
@@ -726,25 +737,25 @@ def print_color(text: str, color: str, end: str = '\n') -> None:
 def print_red(text: str, end: str = '\n') -> None:
     '''Print text as red, goes back to normal color'''
     print_pre()
-    print(red_text(text), end=end, flush=True)
+    print(Colors.color_text(text, color=Colors.red), end=end, flush=True)
     print_post(text, end)
 
 def print_green(text: str, end: str = '\n') -> None:
     '''Print text as green, goes back to normal color'''
     print_pre()
-    print(green_text(text), end=end, flush=True)
+    print(Colors.color_text(text, color=Colors.green), end=end, flush=True)
     print_post(text, end)
 
-def print_orange(text: str, end: str = '\n') -> None:
-    '''Print text as orange, goes back to normal color'''
+def print_yellow(text: str, end: str = '\n') -> None:
+    '''Print text as yellow, goes back to normal color'''
     print_pre()
-    print(orange_text(text), end=end, flush=True)
+    print(Colors.color_text(text, color=Colors.yellow), end=end, flush=True)
     print_post(text, end)
 
-def print_yellow(text: str, end: str = '\n') -> None:
-    '''Print text as yellow, goes back to normal color'''
+def print_foreground_color(text: str, end: str = '\n') -> None:
+    '''Print text as foreground color, goes back to normal color'''
     print_pre()
-    print(yellow_text(text), end=end, flush=True)
+    print(Colors.color_text(text, color=Colors.foreground), end=end, flush=True)
     print_post(text, end)
 
 
@@ -757,8 +768,11 @@ def set_debug_level(level) -> None:
     info(f"Set debug level to {debug_level}")
 
 
-def debug(*text, level: int = 1, start: object = None, end: str = '\n') -> None:
-    '''Print debug messaging (in yellow if possible). If args['debug'] is false, prints nothing.
+def debug(
+        *text, level: int = 1, start: object = None, end: str = '\n', color=Colors.foreground
+) -> None:
+    '''Print debug messaging (in foreground color if possible). If args['debug'] is false,
+    prints nothing.
 
     *text: (positional str args) to be printed
     level: (int) debug level to decide if printed or not.
@@ -771,10 +785,10 @@ def debug(*text, level: int = 1, start: object = None, end: str = '\n') -> None:
         start = "DEBUG: " + (f"[{progname}] " if progname_in_message else "")
     if args['debug'] and \
        (((level==1) and args['verbose']) or (debug_level >= level)):
-        print_yellow(f"{start}{' '.join(list(text))}", end=end)
+        print_color(f"{start}{' '.join(list(text))}", color=color, end=end)
 
 
-def info(*text, start: object = None, end='\n') -> None:
+def info(*text, start: object = None, end='\n', color=Colors.green) -> None:
     '''Print information messaging (in green if possible). If args['quiet'], prints nothing.
 
     *text: (positional str args) to be printed
@@ -786,10 +800,10 @@ def info(*text, start: object = None, end='\n') -> None:
     if start is None:
         start = "INFO: " + (f"[{progname}] " if progname_in_message else "")
     if not args['quiet']:
-        print_green(f"{start}{' '.join(list(text))}", end=end)
+        print_color(f"{start}{' '.join(list(text))}", color=color, end=end)
 
 def warning(*text, start: object = None, end: str = '\n') -> None:
-    '''Print warning messaging (in orange if possible).
+    '''Print warning messaging (in yellow if possible).
 
     *text: (positional str args) to be printed
     start: (optional str) prefix to message; if None: chooses default start str
@@ -800,7 +814,7 @@ def warning(*text, start: object = None, end: str = '\n') -> None:
     if start is None:
         start = "WARNING: " + (f"[{progname}] " if progname_in_message else "")
     args['warnings'] += 1
-    print_orange(f"{start}{' '.join(list(text))}", end=end)
+    print_yellow(f"{start}{' '.join(list(text))}", end=end)
 
 
 def error(
@@ -823,6 +837,7 @@ def error(
 
     if start is None:
         start = "ERROR: " + (f"[{progname}] " if progname_in_message else "")
+        start += safe_emoji("❌ ")
     args['errors'] += 1
     max_error_code = max(max_error_code, error_code)
     print_red(f"{start}{' '.join(list(text))}", end=end)
@@ -856,7 +871,17 @@ def exit( # pylint: disable=redefined-builtin
 
     if global_exit_allowed:
         if not quiet:
-            info(f"Exiting with {args['warnings']} warnings, {args['errors']} errors")
+            info_color = Colors.green
+            start = safe_emoji('🔚 ')
+            if args['errors']:
+                info_color = Colors.red
+                start = safe_emoji('❗ ')
+            elif args['warnings']:
+                info_color = Colors.yellow
+            info(
+                f"{start}Exiting with {args['warnings']} warnings, {args['errors']} errors",
+                color=info_color
+            )
         sys.exit(error_code)
 
     if error_code is None:
@@ -992,14 +1017,18 @@ def import_class_from_string(full_class_name: str) -> None:
 class ShellCommandList(list):
     '''Wrapper around a list, of str that we'll run as a subprocess command
 
-    included member var for tee_path, to save a log from this subprocess commands list
+    included member vars for:
+      - tee_path, to save a log from this subprocess commands list
+      - work_dir - in case we want to run this from non-default location.
     '''
-    def __init__(self, obj: object = None, tee_fpath: str = ''):
+    def __init__(self, obj: object = None, tee_fpath: str = '', work_dir: str = ''):
         super().__init__(obj)
-        for k in ['tee_fpath']:
+        for k in ('tee_fpath', 'work_dir'):
             setattr(self, k, getattr(obj, k, None))
         if tee_fpath:
             self.tee_fpath = tee_fpath
+        if work_dir:
+            self.work_dir = work_dir
 
 
 def write_shell_command_file(

opencos/utils/str_helpers.py

@@ -172,7 +172,7 @@ def pretty_list_columns_manual(data: list, num_columns: int = 4, auto_columns: b
                 pretty_list_columns_manual(data=data, num_columns=num_columns-1, auto_columns=True)
             )
             return ret_lines
-        if max_line_len + max_item_len + _spacing < window_cols:
+        if max_line_len + max_item_len + _spacing <= window_cols:
             # add 1 more column if we're guaranteed to have room.
             ret_lines.extend(
                 pretty_list_columns_manual(data=data, num_columns=num_columns+1, auto_columns=True)
@@ -198,3 +198,8 @@ def print_columns_manual(data: list, num_columns: int = 4, auto_columns: bool =
         data=data, num_columns=num_columns, auto_columns=auto_columns
     )
     print('\n'.join(lines))
+
+def strip_ansi_color(text: str) -> str:
+    '''Strip ANSI color characters from str'''
+    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+    return ansi_escape.sub('', text)

opencos/utils/subprocess_helpers.py

@@ -5,10 +5,18 @@ import shutil
 import subprocess
 import sys
 
-from opencos.util import debug, error, info, progname, global_log
+import psutil
+from opencos.util import debug, error, info, warning, progname, global_log
 
 IS_WINDOWS = sys.platform.startswith('win')
 
+# For non-Windows, we track the background parent PIDs, because some tools (vivado XSim,
+# most Modelsim/Questa variants) tend to spawn children PIDs that don't always respond
+# nicely to a friendly *nix SIGTERM. So we'll remember what our parent PIDs are, and
+# eda.py's (or other CLI opencos script) can use signal to cleanup any remaining
+# parents + children using subprocess_helpers.cleanup_all()
+ALL_PARENT_PIDS = set()
+
 def subprocess_run(
         work_dir: str, command_list: list, fake: bool = False, shell: bool = False
 ) -> int:
@@ -35,10 +43,11 @@ def subprocess_run(
 
     debug(f"subprocess_run: About to call subprocess.run({c}, **{proc_kwargs}")
     proc = subprocess.run(c, check=True, **proc_kwargs)
+    # Note - we do not get PID management for subprocess_run(...)
     return proc.returncode
 
 
-def subprocess_run_background(
+def subprocess_run_background( # pylint: disable=too-many-branches
         work_dir: str, command_list: list, background: bool = True, fake : bool = False,
         shell: bool = False, tee_fpath: str = ''
 ) -> (str, str, int):
@@ -76,6 +85,9 @@ def subprocess_run_background(
 
     debug(f"subprocess_run_background: about to call subprocess.Popen({c}, **{proc_kwargs})")
     proc = subprocess.Popen(c, **proc_kwargs) # pylint: disable=consider-using-with
+    if not background:
+        info(f'PID {proc.pid} for {command_list[0]}')
+    add_running_parent_pid(proc.pid)
 
     stdout = ''
     tee_fpath_f = None
@@ -99,10 +111,61 @@ def subprocess_run_background(
         stdout += line + '\n'
 
     proc.communicate()
+    remove_completed_parent_pid(proc.pid)
+
     rc = proc.returncode
     if tee_fpath_f:
         tee_fpath_f.write(f'INFO: [{progname}] subprocess_run_background: returncode={rc}\n')
         tee_fpath_f.close()
-        info('subprocess_run_background: wrote: ' + os.path.abspath(tee_fpath))
+        if not background:
+            info('subprocess_run_background: wrote: ' + os.path.abspath(tee_fpath))
 
     return stdout, '', rc
+
+
+def add_running_parent_pid(pid: int) -> None:
+    '''Adds pid (if still alive) to ALL_PARENT_PIDS'''
+    try:
+        p = psutil.Process(pid)
+        ALL_PARENT_PIDS.add(p.pid)
+    except psutil.NoSuchProcess:
+        pass
+    except Exception as e:
+        error(f'{pid=} exception {e}')
+
+def remove_completed_parent_pid(pid: int) -> None:
+    '''Removes pid (if no longer alive) from ALL_PARENT_PIDS.'''
+    try:
+        p = psutil.Process(pid)
+        warning(f'PID {p.pid} still running')
+    except psutil.NoSuchProcess:
+        ALL_PARENT_PIDS.remove(pid)
+    except Exception as e:
+        error(f'{pid=} exception {e}')
+
+
+def cleanup_all() -> None:
+    '''Kills everything from ALL_PARENT_PIDS.'''
+    for parent in ALL_PARENT_PIDS:
+        kill_proc_tree(parent)
+
+
+def kill_proc_tree(pid: int, including_parent: bool = True) -> None:
+    '''Kills a process and its entire descendant tree'''
+    try:
+        parent = psutil.Process(pid)
+        children = parent.children(recursive=True)
+        info(f'{pid=} {parent=} {children=}')
+        for child in children:
+            if psutil.Process(child.pid):
+                info(f'parent {pid=} killing {child=}')
+                child.kill()
+        _, still_alive = psutil.wait_procs(children, timeout=5)
+        if still_alive:
+            warning(f'parent {pid=} {still_alive=}')
+        if including_parent:
+            info(f'parent {pid=} killing {parent=}')
+            parent.kill()
+            parent.wait(5)
+    except psutil.NoSuchProcess:
+        pass # Process already terminated

{opencos_eda-0.3.3.dist-info → opencos_eda-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.3.3
+Version: 0.3.6
 Summary: A simple Python package for wrapping RTL simuliatons and synthesis
 Author-email: Simon Sabato <simon@cognichip.ai>, Drew Ranck <drew@cognichip.ai>
 Project-URL: Homepage, https://github.com/cognichip/opencos
@@ -9,13 +9,22 @@ License-File: LICENSE
 License-File: LICENSE.spdx
 Requires-Dist: mergedeep>=1.3.4
 Requires-Dist: peakrdl>=1.1.0
+Requires-Dist: psutil>=7.0.0
 Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: pytest>=8.3.5
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: schema>=0.7.7
 Requires-Dist: toml>=0.10.2
 Requires-Dist: yamllint>=1.35.1
 Requires-Dist: PySerial>=3.5
-Requires-Dist: cocotb>=2.0
 Requires-Dist: supports_color>=0.2.0
+Requires-Dist: cocotb>=2.0
+Requires-Dist: pytest>=8.3.5
+Requires-Dist: coverage>=7.6.1
+Provides-Extra: dev
+Requires-Dist: pylint>=3.0.0; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: mkdocs; extra == "docs"
+Requires-Dist: mkdocs-material; extra == "docs"
+Requires-Dist: mkdocs-wavedrom-plugin; extra == "docs"
+Requires-Dist: mkdocs-plantuml; extra == "docs"
 Dynamic: license-file

{opencos_eda-0.3.3.dist-info → opencos_eda-0.3.6.dist-info}/RECORD

@@ -1,24 +1,24 @@
 opencos/__init__.py,sha256=RwJA9oc1uUlvNX7v5zoqwjnSRNq2NZwRlHqtS-ICJkI,122
 opencos/_version.py,sha256=KaWIjS0c08g-C0fgYY1kXwSPqhOFxaq5pYEeoZhOR_I,617
 opencos/_waves_pkg.sv,sha256=TL5YT9lT-fn2FD54MbVVZROmZ7vtW3ScA_rM2eRzKmU,2068
-opencos/deps_schema.py,sha256=VUdXuq43mKfM-U4x7DSA28-MH1Xqxre6V7Ttw2DeOqI,16762
-opencos/eda.py,sha256=91E-EsyZS-uRadApP-h2onW6rpvLBnrpJoT_9tRtsS8,23322
-opencos/eda_base.py,sha256=jf4t11UPj39swL41z-EJiGTOnHvRScaQc-SAjpZ5XI4,109651
-opencos/eda_config.py,sha256=z3yQOPGBX7-yKp6BdQYfJ9eOJf-Jctl-mwCDj3vj2BI,12712
-opencos/eda_config_defaults.yml,sha256=Bs9UyXckIpauK_tf27iRkig6hBvsuI-PL7HhgCQpA1k,16168
+opencos/deps_schema.py,sha256=fx1_IJhsDYkUciwwCPTXHP6ftFjTsPVjO4xg12twIjw,17384
+opencos/eda.py,sha256=W7D44uv0rWPaQD6OOaQuotNsDnDdhwAoBi4eI-eHQ9E,23418
+opencos/eda_base.py,sha256=jmqpirBKGKg3BLEgie-OgqYUg-JIpYS6Im491MKWF-M,111801
+opencos/eda_config.py,sha256=cKAUKguoFEvFgvi2c36Osf6W767Y4KYjoagflqVhUSw,14168
+opencos/eda_config_defaults.yml,sha256=tbu7hyfPM0AetW0CTMu4J3umGMpHLn5bs5bkWDyFM3w,16260
 opencos/eda_config_max_verilator_waivers.yml,sha256=lTAU4IOEbUWVlPzuer1YYhIyxpPINeA4EJqcRIT-Ymk,840
 opencos/eda_config_reduced.yml,sha256=cQ9jY4J7EvAbeHTiP6bvpDSVJAYiitjLZPSxxLKIEbk,1440
 opencos/eda_deps_bash_completion.bash,sha256=jMkQKY82HBgOnQeMdA1hMrXguRFtB52SMBxUemKovL4,1958
 opencos/eda_deps_sanitize.py,sha256=SQjvrte9Hv9JesRY0wljvbdC6pAmLCikI-Wdzzy-D04,1939
 opencos/eda_extract_targets.py,sha256=POlxZfqf2dNH2nc1CEw5B_53vSHAicSTkpU9_-2_6Zw,2851
-opencos/eda_tool_helper.py,sha256=_YgobDLEWW6Fzdr976LxaCDZ4DKRyuMs5CrYQHaTPrU,2558
-opencos/export_helper.py,sha256=5BnrkhiieJBgYKAryhXD7HSGtrgvXQpZ8B5ltdrhbRY,22649
+opencos/eda_tool_helper.py,sha256=Xm6nr9XweCjueWFLkrH5U3nK96JGeeh86f2GCPhwY-o,3108
+opencos/export_helper.py,sha256=zDkvsUS6FVrpXl1UTy53QG3CuhYp5FFplI9rRzAE2g8,25395
 opencos/export_json_convert.py,sha256=tSIMbLFtc_Fo66EhFovMii1v_qJYyFZJrPNnoPdW7L0,4182
-opencos/files.py,sha256=AQOnsrvoc0r76LiFrkoMbwOGdUO1FpBiFY_jyyI_ve8,1566
+opencos/files.py,sha256=4fomXM5vyA5FUAImSeAjrPchQPysPSD07c_TLYg5cd8,1617
 opencos/names.py,sha256=Y2aJ5wgpbNIJ-_P5xUXnHMv_h-zMOX2Rt6iLuduqC1Q,1213
 opencos/peakrdl_cleanup.py,sha256=vHNGtalTrIVP335PhRjPt9RhoccgpK1HJAi-E4M8Kc8,736
 opencos/seed.py,sha256=IL9Yg-r9SLSRseMVWaEHmuw2_DNi_eyut11EafoNTsU,942
-opencos/util.py,sha256=tgDOvkIGCPfuuJmP1nMsxsxaxmhlH9DOUsJ3SVjtXy4,42123
+opencos/util.py,sha256=h0NfMe4sk5CxEO93z9k7m61kMDbrkbUUrDd9CN2aZAE,43558
 opencos/commands/__init__.py,sha256=oOOQmn5_jHAMSOfA3swJJ7mdoyHsJA0lJwKPTudlTns,1125
 opencos/commands/build.py,sha256=mvJYxk5J15k0Cr8R7oIdIIdsEtWV3gE-LnPweVwtSDo,1487
 opencos/commands/deps_help.py,sha256=WDrU7H9sypzDAxe_CHqhW5B_scbQMzBEdf-v-Jcfd5Q,10682
@@ -31,27 +31,27 @@ opencos/commands/multi.py,sha256=ZkG1b_qhhxXw-Lm2S4J-i576Ai5iJA09UEIDj94FOVM,274
 opencos/commands/open.py,sha256=XckvKUNwvc5KHbYGV-eQ2i0WG4X-yckroDaMC610MB4,804
 opencos/commands/proj.py,sha256=cExW9ZZkw6nkpVyNfeQzJADzmPtbYgBgWml82tqO6jY,1158
 opencos/commands/shell.py,sha256=upHpFs8Gdtzi-boVXwsC-QzEsnvtoZNMAu4oN10kdxw,7801
-opencos/commands/sim.py,sha256=NQJbjfGEgt4zHtOQn5HnaCiBnaDyEkpoDJvnAR4TOxE,21166
+opencos/commands/sim.py,sha256=3mASPqPiCYzoVLstftcOREtMVb0I0RaLo1wiDFl8nhE,21445
 opencos/commands/sweep.py,sha256=ni4XFgnFF8HLXtwPhETyLWfvc2kgtm4bcxFcKzUhkf0,9343
 opencos/commands/synth.py,sha256=m4ZwqHgOF5We0XP94F7TQli11WCPlkzhamI4fDfFR1o,4573
 opencos/commands/targets.py,sha256=_jRNhm2Fqj0fmMvTw6Ba39DCsRHf_r_uZCy_R064kpA,1472
 opencos/commands/upload.py,sha256=oyImgcEFGxDkdeY9EYyX2R6fTOmN-lTs-HYxAZqXUUo,871
 opencos/commands/waves.py,sha256=nrp3ALwfJujZns44tgCgia_dEedQyKe0T3fuws8h39U,7697
 opencos/deps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opencos/deps/defaults.py,sha256=NXh3V4oInrBVlDw64B2OCI77wzdn1NtaD64srhBnmZU,1486
+opencos/deps/defaults.py,sha256=Z6mIVJEV0zQ9rC-HkQFMBFAkixjqKS1TATPSc27wOeA,1502
 opencos/deps/deps_commands.py,sha256=q4JfSfzRO2nM2zdNT4enCy33FokEytZYQJn1HJ6osJk,16606
 opencos/deps/deps_file.py,sha256=YQ5ftYvppRTqUto22r-XDH6-bcMO7cA-WiJ7QzPjljY,17103
-opencos/deps/deps_processor.py,sha256=DBaMUEnpoIL4xaNPs2f2AFGcWLST5pP_Qgup9r-8D7M,41403
+opencos/deps/deps_processor.py,sha256=WvG7p4wo_gNjkS2pxySgDmkomioooctJTxMlmP42kfk,42827
 opencos/hw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/hw/oc_cli.py,sha256=U1JGlshLZhtd0LgndZFBZVltAj_HemdhbjO_Zo8ZuVM,132252
 opencos/hw/pcie.py,sha256=VUJljaZJYgScAAx5yn7F6GoA8K9eTcw24otYZbkMpYs,3035
 opencos/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/tests/custom_config.yml,sha256=TRoVM9ZFKPOA_8JmlpzaMhnGO1txmaD14N_8P1oqzew,257
-opencos/tests/helpers.py,sha256=0KWHUQNXeyQ40F2sdW_R2r0P8qZpV88ndTZmoix3NcU,12474
+opencos/tests/helpers.py,sha256=5EyKRvpNvkJQ4bZcrm340vIZvJ6ed2G6RmWOQAZh7Lk,14113
 opencos/tests/test_build.py,sha256=FQAxOpLVQShAHD_L5rqJctPeSAoqoOCNFI0RXflLuY0,387
 opencos/tests/test_deps_helpers.py,sha256=uQZxleh6aKO-mZQhagHh5xLIBbpQ8dav7-5D0eemq_g,8164
 opencos/tests/test_deps_schema.py,sha256=T3P9KjaMyKsk8b7snNVvNSsom2hIJcg6Z9apYiXoH9Y,941
-opencos/tests/test_eda.py,sha256=PhAFCqoZxUhjuSvNeHpTHdwt8UhHjRdVppesgcWBX64,37407
+opencos/tests/test_eda.py,sha256=8X6kej5-uPv2l0xeWOhitCE640XZtiGLwzCktra_Ehg,37784
 opencos/tests/test_eda_elab.py,sha256=AjU4WMYtFoHpNe1Z4yWWpxDKy4V_hAjL5rl3jqphZrk,3179
 opencos/tests/test_eda_synth.py,sha256=BtBrNVJ9C-LJt3K0wNNS5ukEVrET16AbRXl2IzxudJ8,5744
 opencos/tests/test_oc_cli.py,sha256=w-F-LjSSWVql3D2WG8tcV4_C52i-hL_2WT3oDpKQn9s,734
@@ -64,34 +64,34 @@ opencos/tests/deps_files/non_sv_reqs/DEPS.yml,sha256=VZkahO1AKhD9GUV5lK8VwUONEi5
 opencos/tests/deps_files/tags_with_tools/DEPS.yml,sha256=-5U1qfJElgpVhmkLEu3lYuvDYva8kDlt6JOdB9jidmc,1377
 opencos/tests/deps_files/test_err_fatal/DEPS.yml,sha256=GnXIUJvshQWR9PlYxX67T53ejf5KhDbtD8sUJB4Rwd0,95
 opencos/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opencos/tools/cocotb.py,sha256=hlBR6M4k_amOOWa7cZDuw9fTGJtJha1jSpGgyJN8Iis,17734
+opencos/tools/cocotb.py,sha256=bR97Mb87D0HPdoV82rLT7oszPLmdIPzYU1IEBaGnuXg,20544
 opencos/tools/invio.py,sha256=S2ChWr8xMZHSOOhX2hGKQhMmtQY2potVQjc-lsMg73o,3299
 opencos/tools/invio_helpers.py,sha256=86WOGmSf4m_lEqBtK3DLjWqI0jnqAWzBEBRYfBUGiSY,8804
 opencos/tools/invio_yosys.py,sha256=CszGeTdE1ilnMmWPLW77BrtobbsGb1CKXqot0hGimFU,5996
-opencos/tools/iverilog.py,sha256=8dK4z8ktbNYS9cW5QQPm586WoE-pSmOAVJfXajw-Sbg,6420
+opencos/tools/iverilog.py,sha256=3IQIZVDioChKEJIVVJki-q7NlvBg0k3n61oM7ltG9c8,6551
 opencos/tools/modelsim_ase.py,sha256=Jt-6N3BZZyu25fT1ehFQLRUTVvrcCo4e2Gl7UtsQcuk,17834
 opencos/tools/quartus.py,sha256=_TfmPSYpbhmDLw7Dur-rRP0iGwv9hhQ6E5G-XLiYPEM,30486
 opencos/tools/questa.py,sha256=nHImM0Wydcf4YHGibHmQAwmqKHmMxKZUqY-E-vz1o8M,9827
 opencos/tools/questa_fse.py,sha256=hytkeuGg4qImj7rStV1i2kxkz9B0KFheGtcadxmpYAo,2550
-opencos/tools/riviera.py,sha256=FAumXIt9u4JXwR5BHe-0APX3K0Lg3RT2lWQ-GNGL3vA,13016
+opencos/tools/riviera.py,sha256=_-vsN7TD6WdW4PVsSJaEhJls3RgXGRowhY_QV1hdFqE,13678
 opencos/tools/slang.py,sha256=S_vODMT5Zl5vi9FMGHfahp5B0oMNyDIRJXtRAldVCwY,8625
 opencos/tools/slang_yosys.py,sha256=MKh13eAmLJDkynZiezyT8E2gI4CKnXipzgFCZppaMXo,10230
 opencos/tools/surelog.py,sha256=S2RAZJyjdISm_tRvAhXbla7_z_tJfotZih5f9Y3m7DQ,5648
 opencos/tools/tabbycad_yosys.py,sha256=2LePPgYXBVdsy7YcffPIWN-I0B7queLQ_f_pme2SCGw,7803
-opencos/tools/verilator.py,sha256=yh3DZXhGxt9RyJVtbn2RoqIiwxZW6_sTiXs8xGf3iNg,21065
-opencos/tools/vivado.py,sha256=GQdPd1mp02it_uyhMqpFfJgh0AKIMn-20BhHNEDp5HY,41398
+opencos/tools/verilator.py,sha256=lEsy6VwikTUE3MmuK75NKkRV9YS4MKCPzXH1QZOgcY8,24781
+opencos/tools/vivado.py,sha256=I9yVFK5wnFl1268l8WCk5Xh8wZBlSCODVTg4qStVF8c,41475
 opencos/tools/yosys.py,sha256=t3Au8gdwTepIKCPCXHpRXEdtmORQK8xqNvF6baIa7DM,28260
 opencos/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opencos/utils/markup_helpers.py,sha256=A8Ev5UJ4EVKjdcF2g85SQbjdPZR4jGpNqCLaBy_4v7Q,4569
 opencos/utils/status_constants.py,sha256=na6YsqlsCwIYzTXWE14dPadUYRNTrOS6YTXHCer2NbA,635
-opencos/utils/str_helpers.py,sha256=726ScK5-v7QkBi-zqESKZLsOl2_ya4vVJ5ZhxJqmBFo,6440
-opencos/utils/subprocess_helpers.py,sha256=xemAGPey6M0sWY_FElvr-Z0phCfdjaC-znP8FKihPaE,3535
+opencos/utils/str_helpers.py,sha256=-hR7MAQLOoY2lIfqtxNtnzb3apeJPkh8shEGFzkwQfs,6637
+opencos/utils/subprocess_helpers.py,sha256=idWc-sy_XJaxIl06tt_QjThYWoLL_Wmy7aLCpEo9y3c,5829
 opencos/utils/vscode_helper.py,sha256=9nHyMUIL-gzfW-qLH06sgaCnVK-YTOtu6pusitNNhL8,1363
 opencos/utils/vsim_helper.py,sha256=1johPOGbjbMgnCDSTpgsQcSuAquiqq1Y2MBxS6WY6b4,1552
-opencos_eda-0.3.3.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-opencos_eda-0.3.3.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
-opencos_eda-0.3.3.dist-info/METADATA,sha256=MGcmalurglc-9-KPz1YHp-KOVgLwqOZRRu3cOz6asI0,703
-opencos_eda-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opencos_eda-0.3.3.dist-info/entry_points.txt,sha256=6n1T5NwVYDhN5l1h5zmyT197G4pE0SySDreB0QJzJR0,218
-opencos_eda-0.3.3.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
-opencos_eda-0.3.3.dist-info/RECORD,,
+opencos_eda-0.3.6.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+opencos_eda-0.3.6.dist-info/licenses/LICENSE.spdx,sha256=8gn1610RMP6eFgT3Hm6q9VKXt0RvdTItL_oxMo72jII,189
+opencos_eda-0.3.6.dist-info/METADATA,sha256=EYL2QzXAEnFV7r3iyi2DGm2IBBHNxK8c-seSSIeZIao,1039
+opencos_eda-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opencos_eda-0.3.6.dist-info/entry_points.txt,sha256=6n1T5NwVYDhN5l1h5zmyT197G4pE0SySDreB0QJzJR0,218
+opencos_eda-0.3.6.dist-info/top_level.txt,sha256=J4JDP-LpRyJqPNeh9bSjx6yrLz2Mk0h6un6YLmtqql4,8
+opencos_eda-0.3.6.dist-info/RECORD,,