all checked for UI

Author: anton schulte

mypy.ini

@@ -0,0 +1,3 @@
+[mypy]
+[mypy-vunit.ui.*]
+disallow_untyped_defs = True

vunit/configuration.py

@@ -12,6 +12,7 @@
 import inspect
 from pathlib import Path
 from copy import copy
+from typing import Any, Callable, OrderedDict, Union
 from vunit.sim_if.factory import SIMULATOR_FACTORY
 
 
@@ -111,7 +112,7 @@ def set_vhdl_configuration_name(self, name):
         """
         self.vhdl_configuration_name = name
 
-    def set_generic(self, name, value):
+    def set_generic(self, name: str, value: Any) -> None:
         """
         Set generic
         """
@@ -128,7 +129,7 @@ def set_generic(self, name, value):
         else:
             self.generics[name] = value
 
-    def set_sim_option(self, name, value):
+    def set_sim_option(self, name: str, value: Union[str, list[str], bool]):
         """
         Set sim option
         """
@@ -195,11 +196,10 @@ class ConfigurationVisitor(object):
     def _check_enabled(self):
         pass
 
-    @staticmethod
-    def get_configuration_dicts():
+    def get_configuration_dicts(self) -> list[OrderedDict[Any, Configuration]]:
         raise NotImplementedError
 
-    def set_attribute(self, name, value):
+    def set_attribute(self, name: str, value: Any):
         """
         Set attribute
         """
@@ -226,7 +226,7 @@ def set_vhdl_configuration_name(self, value: str):
             for config in configs.values():
                 config.set_vhdl_configuration_name(value)
 
-    def set_sim_option(self, name, value, overwrite=True):
+    def set_sim_option(self, name: str, value: Union[str, list[str], bool], overwrite=True) -> None:
         """
         Set sim option
 
@@ -240,7 +240,7 @@ def set_sim_option(self, name, value, overwrite=True):
                     continue
                 config.set_sim_option(name, value)
 
-    def set_pre_config(self, value):
+    def set_pre_config(self, value: Callable) -> None:
         """
         Set pre_config function
         """

vunit/library.py

@@ -11,6 +11,9 @@
 """
 
 import logging
+from typing import cast
+from vunit.design_unit import Entity, VHDLDesignUnit
+from vunit.source_file import SourceFile, VHDLSourceFile, VerilogSourceFile
 from vunit.vhdl_standard import VHDLStandard
 
 LOGGER = logging.getLogger(__name__)
@@ -46,7 +49,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):
+    def add_source_file(self, source_file: SourceFile) -> SourceFile:
         """
         Add source file to library unless it exists
 
@@ -104,7 +107,7 @@ def _check_duplication(self, dictionary, design_unit):
         if design_unit.name in dictionary:
             self._warning_on_duplication(design_unit, dictionary[design_unit.name].source_file.name)
 
-    def add_vhdl_design_units(self, design_units):
+    def add_vhdl_design_units(self, design_units: list[VHDLDesignUnit]):
         """
         Add VHDL design units to the library
         """
@@ -119,7 +122,7 @@ def add_vhdl_design_units(self, design_units):
                     self._entities[design_unit.name] = design_unit
 
                     for architecture in self._architectures[design_unit.name].values():
-                        design_unit.add_architecture(architecture)
+                        cast(Entity, design_unit).add_architecture(architecture)
 
             else:
                 if design_unit.unit_type == "architecture":

vunit/project.py

@@ -45,15 +45,15 @@ def __init__(self, depend_on_package_body=False, database=None):
         self._database = database
         self._vhdl_parser = VHDLParser(database=self._database)
         self._verilog_parser = VerilogParser(database=self._database)
-        self._libraries = OrderedDict()
+        self._libraries: OrderedDict[str, Library] = OrderedDict()
         # Mapping between library lower case name and real library name
         self._lower_library_names_dict = {}
-        self._source_files_in_order = []
+        self._source_files_in_order: list[SourceFile] = []
         self._manual_dependencies = []
         self._depend_on_package_body = depend_on_package_body
         self._builtin_libraries = set(["ieee", "std"])
 
-    def _validate_new_library_name(self, library_name):
+    def _validate_new_library_name(self, library_name: str) -> None:
         """
         Check that the library_name is valid or raise RuntimeError
         """
@@ -74,15 +74,15 @@ def _validate_new_library_name(self, library_name):
                 f"Library name {self._lower_library_names_dict[lower_name]!r} previously defined"
             )
 
-    def add_builtin_library(self, logical_name):
+    def add_builtin_library(self, logical_name: str) -> None:
         """
         Add a builtin library name that does not give missing dependency warnings
         """
         self._builtin_libraries.add(logical_name)
 
     def add_library(
         self,
-        logical_name,
+        logical_name: str,
         directory: Union[str, Path],
         vhdl_standard: VHDLStandard = VHDL.STD_2008,
         is_external=False,
@@ -118,7 +118,7 @@ def add_source_file(  # pylint: disable=too-many-arguments
         defines=None,
         vhdl_standard: Optional[VHDLStandard] = None,
         no_parse=False,
-    ):
+    ) -> SourceFile:
         """
         Add a file_name as a source file in library_name with file_type
 
@@ -515,7 +515,7 @@ def _get_files_to_recompile(self, files, dependency_graph, incremental):
                 result_list.append(source_file)
         return result_list
 
-    def get_dependencies_in_compile_order(self, target_files=None, implementation_dependencies=False):
+    def get_dependencies_in_compile_order(self, target_files=None, implementation_dependencies=False) -> list[SourceFile]:
         """
         Get a list of dependencies of target files including the
         target files.
@@ -591,7 +591,7 @@ def comparison_key(source_file):
 
         return sorted(files, key=comparison_key)
 
-    def get_source_files_in_order(self):
+    def get_source_files_in_order(self) -> list[SourceFile]:
         """
         Get a list of source files in the order they were added to the project
         """

vunit/sim_if/__init__.py

@@ -13,11 +13,13 @@
 from os import environ, listdir, pathsep
 import subprocess
 from pathlib import Path
-from typing import List
+from typing import Any, List, Union
 from ..ostools import Process, simplify_path
 from ..exceptions import CompileError
 from ..color_printer import NO_COLOR_PRINTER
 
+OptionType = Union[str, list[str], bool]
+
 
 class Option(object):
     """
@@ -416,7 +418,7 @@ def validate(self, value):
             raise ValueError(f"Option {self.name!r} must be one of {self._legal_values!s}. Got {value!r}")
 
 
-def is_string_not_iterable(value):
+def is_string_not_iterable(value: Any) -> bool:
     """
     Returns True if value is a string and not another iterable
     """

vunit/sim_if/factory.py

@@ -9,13 +9,14 @@
 """
 
 import os
+from typing import Union
 from .activehdl import ActiveHDLInterface
 from .ghdl import GHDLInterface
 from .incisive import IncisiveInterface
 from .modelsim import ModelSimInterface
 from .nvc import NVCInterface
 from .rivierapro import RivieraProInterface
-from . import BooleanOption, ListOfStringOption, VHDLAssertLevelOption
+from . import BooleanOption, ListOfStringOption, Option, VHDLAssertLevelOption
 
 
 class SimulatorFactory(object):
@@ -37,7 +38,7 @@ def supported_simulators():
             NVCInterface,
         ]
 
-    def _extract_compile_options(self):
+    def _extract_compile_options(self) -> dict[str, Option]:
         """
         Return all supported compile options
         """
@@ -51,7 +52,7 @@ def _extract_compile_options(self):
                 result[opt.name] = opt
         return result
 
-    def _extract_sim_options(self):
+    def _extract_sim_options(self) -> dict[str, Option]:
         """
         Return all supported sim options
         """
@@ -75,7 +76,7 @@ def _extract_sim_options(self):
 
         return result
 
-    def check_sim_option(self, name, value):
+    def check_sim_option(self, name: str, value: Union[str, list[str], bool]):
         """
         Check that sim_option has legal name and value
         """
@@ -94,7 +95,7 @@ def check_compile_option_name(self, name):
         if name not in known_options:
             raise ValueError(f"Unknown compile_option {name!r}, expected one of {known_options!r}")
 
-    def check_compile_option(self, name, value):
+    def check_compile_option(self, name: str, value: Union[str, list[str], bool]) -> None:
         """
         Check that the compile option is valid
         """

vunit/source_file.py

@@ -8,10 +8,11 @@
 Functionality to represent and operate on VHDL and Verilog source files
 """
 from pathlib import Path
-from typing import Union
+from typing import Literal, Union
 import logging
 from copy import copy
 import traceback
+from vunit.sim_if import OptionType
 from vunit.sim_if.factory import SIMULATOR_FACTORY
 from vunit.hashing import hash_string
 from vunit.vhdl_parser import VHDLReference
@@ -35,7 +36,7 @@ def __init__(self, name, library, file_type):
         self.file_type = file_type
         self.design_units = []
         self._content_hash = None
-        self._compile_options = {}
+        self._compile_options: dict[str, OptionType] = {}
 
         # The file name before preprocessing
         self.original_name = name
@@ -70,14 +71,14 @@ def __hash__(self):
     def __repr__(self):
         return f"SourceFile({self.name!s}, {self.library.name!s})"
 
-    def set_compile_option(self, name, value):
+    def set_compile_option(self, name: str, value: OptionType):
         """
         Set compile option
         """
         SIMULATOR_FACTORY.check_compile_option(name, value)
         self._compile_options[name] = copy(value)
 
-    def add_compile_option(self, name, value):
+    def add_compile_option(self, name: str, value: OptionType):
         """
         Add compile option
         """
@@ -86,7 +87,7 @@ def add_compile_option(self, name, value):
         if name not in self._compile_options:
             self._compile_options[name] = copy(value)
         else:
-            self._compile_options[name] += value
+            self._compile_options[name] += value  # type: ignore
 
     @property
     def compile_options(self):
@@ -118,6 +119,9 @@ def content_hash(self):
         """
         return hash_string(self._content_hash + self._compile_options_hash())
 
+    def add_to_library(self, library: Library):
+        raise NotImplemented
+
 
 class VerilogSourceFile(SourceFile):
     """
@@ -347,7 +351,7 @@ def add_to_library(self, library):
 FILE_TYPES = ("vhdl",) + VERILOG_FILE_TYPES
 
 
-def file_type_of(file_name):
+def file_type_of(file_name: Union[str, Path]) -> Literal["vhdl", "verilog", "systemverilog"]:
     """
     Return the file type of file_name based on the file ending
     """

vunit/test/bench.py

@@ -14,6 +14,7 @@
 import bisect
 import collections
 from collections import OrderedDict
+from typing import Any, Iterable, Union
 from ..ostools import file_exists
 from ..cached import cached
 from ..vhdl_parser import remove_comments as remove_vhdl_comments
@@ -37,7 +38,7 @@ def __init__(self, design_unit, database=None):
         self._database = database
 
         self._individual_tests = False
-        self._configs = {}
+        self._configs: OrderedDict[Any, Configuration] = OrderedDict()
         self._test_cases = []
         self._implicit_test = None
 
@@ -142,7 +143,7 @@ def get_test_case(self, name):
                 return test_case
         raise KeyError(name)
 
-    def get_configuration_dicts(self):  # pylint: disable=arguments-differ
+    def get_configuration_dicts(self) -> list[OrderedDict[str, Configuration]]:  # pylint: disable=arguments-differ
         """
         Get all configurations within the test bench
 
@@ -166,7 +167,7 @@ def _get_configurations_to_run(self):
             del configs[DEFAULT_NAME]
         return configs.values()
 
-    def scan_tests_from_file(self, file_name):
+    def scan_tests_from_file(self, file_name: Union[str, Path]) -> None:
         """
         Scan file for test cases and attributes
         """
@@ -337,7 +338,7 @@ def __init__(self, test, design_unit, enable_configuration, default_config):
         assert test.is_explicit
         self.design_unit = design_unit
         self._enable_configuration = enable_configuration
-        self._configs = OrderedDict({default_config.name: default_config})
+        self._configs: OrderedDict[Any, Configuration] = OrderedDict({default_config.name: default_config})
 
     @property
     def name(self):
@@ -358,13 +359,13 @@ def _check_enabled(self):
         if not self._enable_configuration:
             raise RuntimeError("Individual test configuration is not possible with run_all_in_same_sim")
 
-    def get_configuration_dicts(self):  # pylint: disable=arguments-differ
+    def get_configuration_dicts(self) -> list[OrderedDict[Any, Configuration]]:  # pylint: disable=arguments-differ
         """
         Get all configurations of this test
         """
         return [self._configs]
 
-    def _get_configurations_to_run(self):
+    def _get_configurations_to_run(self) -> Iterable[Configuration]:
         """
         Get all simulation runs for this test bench
         """