opencos-eda 0.3.11__tar.gz → 0.3.12__tar.gz

{opencos_eda-0.3.11/opencos_eda.egg-info → opencos_eda-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencos-eda
-Version: 0.3.11
+Version: 0.3.12
 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

{opencos_eda-0.3.11 → opencos_eda-0.3.12}/opencos/commands/multi.py

@@ -281,7 +281,7 @@ class CommandMulti(CommandParallel):
         if parsed.parallel < 1 or parsed.parallel > 256:
             self.error("Arg 'parallel' must be between 1 and 256")
 
-        command = self.get_command_from_unparsed_args(tokens=unparsed)
+        command = self.get_sub_command_from_config()
 
         # Need to know the tool for this command, either it was set correctly via --tool and/or
         # the command (class) will tell us.

{opencos_eda-0.3.11 → opencos_eda-0.3.12}/opencos/commands/sweep.py

@@ -72,7 +72,7 @@ class CommandSweep(CommandDesign, CommandParallel):
 
         self.check_args()
 
-        self.single_command = self.get_command_from_unparsed_args(tokens=unparsed)
+        self.single_command = self.get_sub_command_from_config()
 
         self._append_sweep_args(arg_tokens=arg_tokens)
 

{opencos_eda-0.3.11 → opencos_eda-0.3.12}/opencos/commands/upload.py

@@ -204,9 +204,9 @@ class CommandUpload(Command):
         tool = tools_found.pop() # only item in set
         # Do we have a handler for this in our config?
         if tool in self.config.get('tools_loaded', []):
-            auto_tools_order = self.config.get('auto_tools_order', [{}])[0]
-            if tool in auto_tools_order:
-                cls_str = auto_tools_order[tool].get('handlers', {}).get(self.command_name, None)
+            tool_cfg = self.config.get('tools', {}).get(tool, {})
+            if tool_cfg:
+                cls_str = tool_cfg.get('handlers', {}).get(self.command_name, None)
                 if cls_str:
                     cls = import_class_from_string(cls_str)
                     if issubclass(cls, Command):
@@ -217,5 +217,5 @@ class CommandUpload(Command):
 
         warning(f'No handler found for tool={tool} to process bitfiles: {self.bitfiles}')
         debug(f'config -- tools_loaded: {self.config["tools_loaded"]}')
-        debug(f'config -- auto_tools_order for tool: {self.config["auto_tools_order"][0][tool]}')
+        debug(f'config -- tools for tool: {self.config["tools"].get(tool, "")}')
         return self

{opencos_eda-0.3.11 → opencos_eda-0.3.12}/opencos/commands/waves.py

@@ -15,10 +15,12 @@ handler).
 # pylint: disable=R0801
 
 import os
+import subprocess
 
 from opencos import util
 from opencos.eda_base import CommandDesign
 from opencos.files import safe_shutil_which
+from opencos.utils import vscode_helper
 
 
 class CommandWaves(CommandDesign):
@@ -51,6 +53,48 @@ class CommandWaves(CommandDesign):
             + ' to stdout',
         })
 
+    def get_versions_of_tool(self, tool: str) -> str:
+        '''Similar to Tool.get_versions(), returns the version of 'tool' for tools like:
+
+        - vaporview
+        - gtkwave
+
+        This is called by eda_tool_helper.get_handler_tool_version(tool, cmd, config)
+        '''
+
+        entry = self.config.get('tools', {}).get(tool, {})
+
+        if entry and 'requires_vscode_extension' in entry:
+            # vaporview, surfer
+            vscode_ext_name = entry.get('requires_vscode_extension', [''])[0]
+            vscode_helper.init()
+            ver = vscode_helper.EXTENSIONS.get(vscode_ext_name)
+            return ver
+
+        if entry and tool == 'gtkwave':
+            # gtkwave --version is fast.
+            proc = None
+            try:
+                proc = subprocess.run(
+                    [safe_shutil_which('gtkwave'), '--version'],
+                    capture_output=True, check=False
+                )
+            except Exception as e:
+                util.debug(f'gtkwave --version: exception {e}')
+
+            if not proc or not proc.stdout:
+                return ''
+
+            for line in proc.stdout.decode('utf-8', errors='replace').split('\n'):
+                if line.lower().startswith('gtkwave analyzer v'):
+                    parts = line.split(' ')
+                    return parts[2][1:] # trim the leading 'v' in 'v1.2.3'
+            return ''
+
+        return ''
+
+
+
 
     def get_wave_files_in_dirs(self, wave_dirs: list, quiet: bool = False) -> list:
         '''Returns list of all wave files give wave_dirs (list)'''