fix testing

Author: Anton Schulte

vunit/library.py

@@ -13,7 +13,10 @@
 import logging
 from typing import cast
 from vunit.design_unit import Entity, VHDLDesignUnit
-from vunit.source_file import SourceFile, VHDLSourceFile, VerilogSourceFile
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.source_file import SourceFile, VHDLSourceFile, VerilogSourceFile
 from vunit.vhdl_standard import VHDLStandard
 
 LOGGER = logging.getLogger(__name__)
@@ -49,7 +52,7 @@ def __init__(self, name: str, directory: str, vhdl_standard: VHDLStandard, is_ex
 
         self._is_external = is_external
 
-    def add_source_file(self, source_file: SourceFile) -> SourceFile:
+    def add_source_file(self, source_file: "SourceFile") -> "SourceFile":
         """
         Add source file to library unless it exists
 

vunit/ui/__init__.py

@@ -23,7 +23,6 @@
 from vunit.test.list import TestList
 
 from vunit.ui.preprocessor import Preprocessor
-from vunit.source_file import SourceFile as Source_File
 
 from ..database import PickledDataBase, DataBase
 from .. import ostools
@@ -48,6 +47,11 @@
 from .library import Library, LibraryList
 from .results import Results
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.source_file import SourceFile as Source_File
+
 
 class VUnit(object):  # pylint: disable=too-many-instance-attributes, too-many-public-methods
     """
@@ -943,7 +947,7 @@ def _compile(self, simulator_if: SimulatorInterface) -> None:
             target_files=target_files,
         )
 
-    def _get_testbench_files(self, simulator_if: Union[None, SimulatorInterface]) -> list[Source_File]:
+    def _get_testbench_files(self, simulator_if: Union[None, SimulatorInterface]) -> list["Source_File"]:
         """
         Return the list of all test bench files for the currently selected tests to run
         """

vunit/ui/library.py

@@ -14,7 +14,6 @@
 from vunit.sim_if import OptionType
 
 from vunit.test.bench_list import TestBenchList
-from vunit.ui import VUnit
 from vunit.ui.preprocessor import Preprocessor
 from ..vhdl_standard import VHDL, VHDLStandard
 from ..project import Project
@@ -25,13 +24,18 @@
 from .testbench import TestBench
 from .packagefacade import PackageFacade
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.ui import VUnit
+
 
 class Library(object):
     """
     User interface of a library
     """
 
-    def __init__(self, library_name: str, parent: VUnit, project: Project, test_bench_list: TestBenchList) -> None:
+    def __init__(self, library_name: str, parent: "VUnit", project: Project, test_bench_list: TestBenchList) -> None:
         self._library_name = library_name
         self._parent = parent
         self._project = project

vunit/ui/packagefacade.py

@@ -12,17 +12,20 @@
 from typing import Optional, Union
 from vunit.design_unit import DesignUnit
 
-from vunit.ui import VUnit
 from vunit.ui.source import SourceFileList
 from ..com import codec_generator
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.ui import VUnit
 
 
 class PackageFacade(object):
     """
     User interface of a Package
     """
 
-    def __init__(self, parent: VUnit, library_name: str, package_name: str, design_unit: DesignUnit) -> None:
+    def __init__(self, parent: "VUnit", library_name: str, package_name: str, design_unit: DesignUnit) -> None:
         self._parent = parent
         self._library_name = library_name
         self._package_name = package_name

vunit/ui/results.py

@@ -10,9 +10,11 @@
 
 from pathlib import Path
 from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING
 
-from vunit.sim_if import SimulatorInterface
-from vunit.test.report import TestReport
+if TYPE_CHECKING:
+    from vunit.sim_if import SimulatorInterface
+    from vunit.test.report import TestReport
 from .common import TEST_OUTPUT_PATH
 
 
@@ -21,7 +23,7 @@ class Results(object):
     Gives access to results after running tests
     """
 
-    def __init__(self, output_path: str, simulator_if: SimulatorInterface, report: TestReport) -> None:
+    def __init__(self, output_path: str, simulator_if: "SimulatorInterface", report: "TestReport") -> None:
         self._output_path = output_path
         self._simulator_if = simulator_if
         self._report = report

vunit/ui/source.py

@@ -12,18 +12,21 @@
 
 from vunit.project import Project
 from vunit.sim_if import OptionType
-from vunit.ui import VUnit
-from vunit.ui.library import Library
 from .. import ostools
-from vunit.source_file import SourceFile as Source_File, VHDLSourceFile
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.source_file import SourceFile as Source_File
+    from vunit.ui import VUnit
+    from vunit.ui.library import Library
 
 
 class SourceFile(object):
     """
     A single file
     """
 
-    def __init__(self, source_file: Source_File, project: Project, ui: VUnit) -> None:
+    def __init__(self, source_file: "Source_File", project: Project, ui: "VUnit") -> None:
         self._source_file = source_file
         self._project = project
         self._ui = ui
@@ -41,13 +44,16 @@ def vhdl_standard(self) -> Optional[str]:
         The VHDL standard applicable to the file,
         None if not a VHDL file
         """
+        # Import here to avoid circular import problems
+        from vunit.source_file import VHDLSourceFile
+
         if isinstance(self._source_file, VHDLSourceFile):
             return str(self._source_file.get_vhdl_standard())
 
         return None
 
     @property
-    def library(self) -> Library:
+    def library(self) -> "Library":
         """
         The library of the source file
         """
@@ -85,7 +91,7 @@ def get_compile_option(self, name: str) -> OptionType:
         """
         return self._source_file.get_compile_option(name)
 
-    def add_dependency_on(self, source_file: Union[Iterable[Source_File], Source_File]) -> None:
+    def add_dependency_on(self, source_file: Union[Iterable["Source_File"], "Source_File"]) -> None:
         """
         Add manual dependency of this file other file(s)
 
@@ -142,7 +148,7 @@ def add_compile_option(self, name: str, value: OptionType) -> None:
         for source_file in self:
             source_file.add_compile_option(name, value)
 
-    def add_dependency_on(self, source_file: Source_File) -> None:
+    def add_dependency_on(self, source_file: "Source_File") -> None:
         """
         Add manual dependency of these files on other file(s)
 

vunit/ui/testbench.py

@@ -12,10 +12,13 @@
 from typing import Any, Callable, Optional, cast
 
 from vunit.sim_if import OptionType
-from vunit.ui.library import Library
 from .common import lower_generics
 from .test import Test
 from vunit.test.bench import TestBench as Test_Bench
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from vunit.ui.library import Library
 
 
 class TestBench(object):
@@ -25,7 +28,7 @@ class TestBench(object):
     bench will apply that option to all test cases belonging to that test bench.
     """
 
-    def __init__(self, test_bench: Test_Bench, library: Library) -> None:
+    def __init__(self, test_bench: Test_Bench, library: "Library") -> None:
         self._test_bench = test_bench
         self._library = library
 
@@ -37,7 +40,7 @@ def name(self) -> str:
         return self._test_bench.name
 
     @property
-    def library(self) -> Library:
+    def library(self) -> "Library":
         """
         :returns: The library that contains this test bench
         """