cocotb 1.9.2__cp312-cp312-win_amd64.whl → 2.0.0b1__cp312-cp312-win_amd64.whl

cocotb/_sim_versions.py → cocotb_tools/sim_versions.py

@@ -2,6 +2,8 @@
 # Licensed under the Revised BSD License, see LICENSE for details.
 # SPDX-License-Identifier: BSD-3-Clause
 
+# type: ignore  # distutils is untyped, so there's little reason to check this file
+
 """
 Classes to compare simulation versions.
 
@@ -11,7 +13,7 @@ These are for cocotb-internal use only.
     These classes silently allow comparing versions of different simulators.
 """
 
-from cocotb._vendor.distutils_version import LooseVersion
+from cocotb_tools._vendor.distutils_version import LooseVersion
 
 
 class ActivehdlVersion(LooseVersion):
@@ -21,25 +23,21 @@ class ActivehdlVersion(LooseVersion):
     ActivehdlVersion("10.5a.12.6914") > ActivehdlVersion("10.5.216.6767")
     """
 
-    pass
-
 
 class CvcVersion(LooseVersion):
     """Version numbering class for Tachyon DA CVC.
 
     Example:
-        >>> CvcVersion("OSS_CVC_7.00b-x86_64-rhel6x of 07/07/14 (Linux-elf)") > CvcVersion("OSS_CVC_7.00a-x86_64-rhel6x of 07/07/14 (Linux-elf)")
+        >>> CvcVersion(
+        ...     "OSS_CVC_7.00b-x86_64-rhel6x of 07/07/14 (Linux-elf)"
+        ... ) > CvcVersion("OSS_CVC_7.00a-x86_64-rhel6x of 07/07/14 (Linux-elf)")
         True
     """
 
-    pass
-
 
 class GhdlVersion(LooseVersion):
     """Version numbering class for GHDL."""
 
-    pass
-
 
 class IcarusVersion(LooseVersion):
     """Version numbering class for Icarus Verilog.
@@ -51,14 +49,10 @@ class IcarusVersion(LooseVersion):
         True
     """
 
-    pass
-
 
 class ModelsimVersion(LooseVersion):
     """Version numbering class for Mentor ModelSim."""
 
-    pass
-
 
 class QuestaVersion(LooseVersion):
     """Version numbering class for Mentor Questa.
@@ -96,8 +90,6 @@ class RivieraVersion(LooseVersion):
         True
     """
 
-    pass
-
 
 class VcsVersion(LooseVersion):
     """Version numbering class for Synopsys VCS.
@@ -107,8 +99,6 @@ class VcsVersion(LooseVersion):
         True
     """
 
-    pass
-
 
 class VerilatorVersion(LooseVersion):
     """Version numbering class for Verilator.
@@ -118,8 +108,6 @@ class VerilatorVersion(LooseVersion):
         True
     """
 
-    pass
-
 
 class XceliumVersion(LooseVersion):
     """Version numbering class for Cadence Xcelium.
@@ -131,8 +119,6 @@ class XceliumVersion(LooseVersion):
         True
     """
 
-    pass
-
 
 class IusVersion(XceliumVersion):  # inherit everything from Xcelium
     """Version numbering class for Cadence IUS.
@@ -142,4 +128,13 @@ class IusVersion(XceliumVersion):  # inherit everything from Xcelium
         True
     """
 
-    pass
+
+class NvcVersion(LooseVersion):
+    """Version numbering class for NVC."""
+
+    @classmethod
+    def from_commandline(cls, cmdline):
+        firstline = cmdline.split("\n")[0]
+        sim, version, *version_extra = firstline.strip().split(" ")
+        assert sim == "nvc"
+        return cls(version)

pygpi/entry.py

@@ -1,26 +1,43 @@
 import importlib
 import os
 from functools import reduce
-from types import ModuleType
-from typing import Callable, Tuple
+from typing import Any, Callable, List, Tuple, cast
 
 
-def load_entry() -> Tuple[ModuleType, Callable]:
-    """Gather entry point information by parsing :envvar:`PYGPI_ENTRY_POINT`."""
+def load_entry(argv: List[str]) -> None:
+    """Gather entry point information by parsing :envvar:`PYGPI_USERS`."""
+
     entry_point_str = os.environ.get(
-        "PYGPI_ENTRY_POINT", "cocotb:_initialise_testbench"
+        "PYGPI_USERS",
+        ",".join(
+            (
+                "cocotb_tools._coverage:start_cocotb_library_coverage",
+                "cocotb.logging:_init",
+                "cocotb.logging:_setup_formatter",
+                "cocotb._init:init_package_from_simulation",
+                "cocotb._init:run_regression",
+            )
+        ),
     )
+
+    # Parse the entry point string of the form "module:func,module:func,...".
+    # Any failure prevents any entry points from being loaded.
+    entry_points: List[Tuple[str, str]] = []
     try:
-        if ":" not in entry_point_str:
-            raise ValueError(
-                "Invalid PYGPI_ENTRY_POINT, missing entry function (no colon)."
-            )
-        entry_module_str, entry_func_str = entry_point_str.split(":", 1)
-        entry_module = importlib.import_module(entry_module_str)
-        entry_func = reduce(getattr, entry_func_str.split("."), entry_module)
+        entry_points_str = entry_point_str.split(",")
+        for entry_point_str in entry_points_str:
+            entry_module_str, entry_func_str = entry_point_str.split(":")
+            # TODO maybe some basic validation of the module and function names.
+            # WITHOUT IMPORTING THEM.
+            entry_points.append((entry_module_str, entry_func_str))
     except Exception as e:
-        raise RuntimeError(
-            "Failure to parse PYGPI_ENTRY_POINT ('{}')".format(entry_point_str)
-        ) from e
-    else:
-        return entry_module, entry_func
+        raise RuntimeError(f"Failure to parse PYGPI_USERS ('{entry_point_str}')") from e
+
+    # Run all entry points.
+    # Expect failure to stop the loading of any additional entry points.
+    for entry_module_str, entry_func_str in entry_points:
+        entry_module = importlib.import_module(entry_module_str)
+        entry_func: Callable[[List[str]], object] = reduce(
+            getattr, entry_func_str.split("."), cast("Any", entry_module)
+        )
+        entry_func(argv)