Fixed linting related to too many positional arguments

tools/doc_support.py

@@ -66,6 +66,7 @@ def highlight_code(
     code_path,
     output_path,
     snippet_name=None,
+    *,
     line_no_offset=None,
     functions=None,
     types=None,

vunit/cached.py

@@ -13,7 +13,7 @@
 from vunit.ostools import read_file
 
 
-def cached(key, function, file_name, encoding, database=None, newline=None):
+def cached(key, function, file_name, encoding, *, database=None, newline=None):
     """
     Call function with file content if an update is needed
     """

vunit/configuration.py

@@ -34,6 +34,7 @@ def __init__(  # pylint: disable=too-many-arguments
         self,
         name,
         design_unit,
+        *,
         generics=None,
         sim_options=None,
         pre_config=None,
@@ -282,6 +283,7 @@ def _check_architectures(design_unit):
     def add_config(  # pylint: disable=too-many-arguments
         self,
         name,
+        *,
         generics=None,
         pre_config=None,
         post_check=None,

vunit/design_unit.py

@@ -52,6 +52,7 @@ def __init__(
         name,
         source_file,
         unit_type,
+        *,
         is_primary=True,
         primary_design_unit=None,
     ):
@@ -66,7 +67,7 @@ class Entity(VHDLDesignUnit):
     """
 
     def __init__(self, name, source_file, generic_names=None):
-        VHDLDesignUnit.__init__(self, name, source_file, "entity", True)
+        VHDLDesignUnit.__init__(self, name, source_file, "entity", is_primary=True)
         self.generic_names = [] if generic_names is None else generic_names
         self._add_architecture_callback = None
         self._architecture_names = {}

vunit/parsing/verilog/parser.py

@@ -164,6 +164,7 @@ class VerilogDesignFile(object):
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
+        *,
         modules=None,
         packages=None,
         imports=None,

vunit/parsing/verilog/preprocess.py

@@ -81,7 +81,7 @@ def _preprocess(self, tokens, defines=None, include_paths=None, included_files=N
 
         return result
 
-    def preprocessor(  # pylint: disable=too-many-arguments,too-many-branches
+    def preprocessor(  # pylint: disable=too-many-arguments,too-many-branches,too-many-positional-arguments
         self, token, stream, defines, include_paths, included_files
     ):
         """
@@ -162,7 +162,7 @@ def _skip_protected_region(stream):
                     if token.value == "end_protected":
                         return
 
-    def expand_macro(  # pylint: disable=too-many-arguments
+    def expand_macro(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self, macro_token, stream, defines, include_paths, included_files
     ):
         """
@@ -254,7 +254,9 @@ def determine_if_taken(if_token, arg):
         stream.skip_while(NEWLINE)
         return result
 
-    def include(self, token, stream, include_paths, included_files, defines):  # pylint: disable=too-many-arguments
+    def include(
+        self, token, stream, include_paths, included_files, defines
+    ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
         """
         Handle `include directive
         """

vunit/project.py

@@ -113,6 +113,7 @@ def add_source_file(  # pylint: disable=too-many-arguments
         self,
         file_name,
         library_name,
+        *,
         file_type="vhdl",
         include_dirs=None,
         defines=None,

vunit/sim_if/ghdl.py

@@ -93,6 +93,7 @@ def __init__(  # pylint: disable=too-many-arguments
         self,
         output_path,
         prefix,
+        *,
         gui=False,
         viewer_fmt=None,
         viewer_args="",
@@ -286,7 +287,7 @@ def compile_vhdl_file_command(self, source_file):
 
     def _get_command(
         self, config, output_path, elaborate_only, ghdl_e, test_suite_name, wave_file
-    ):  # pylint: disable=too-many-branches,too-many-arguments
+    ):  # pylint: disable=too-many-branches,too-many-arguments,too-many-positional-arguments
         """
         Return GHDL simulation command
         """
@@ -392,9 +393,12 @@ def simulate(self, output_path, test_suite_name, config, elaborate_only):  # pyl
             status = False
 
         if config.sim_options.get(self.name + ".gtkwave_script.gui", None):
-            LOGGER.warning("%s.gtkwave_script.gui is deprecated and will be removed "
-                           "in a future version, use %s.viewer_script.gui instead",
-                           self.name, self.name)
+            LOGGER.warning(
+                "%s.gtkwave_script.gui is deprecated and will be removed "
+                "in a future version, use %s.viewer_script.gui instead",
+                self.name,
+                self.name,
+            )
 
         if self._gui and not elaborate_only:
             cmd = [self._get_viewer(config)] + shlex.split(self._viewer_args) + [data_file_name]

vunit/sim_if/incisive.py

@@ -84,7 +84,7 @@ def supports_vhdl_contexts():
         return False
 
     def __init__(  # pylint: disable=too-many-arguments
-        self, prefix, output_path, gui=False, log_level=None, cdslib=None, hdlvar=None
+        self, prefix, output_path, *, gui=False, log_level=None, cdslib=None, hdlvar=None
     ):
         SimulatorInterface.__init__(self, output_path, gui)
         self._prefix = prefix

vunit/sim_if/nvc.py

@@ -74,7 +74,7 @@ def find_prefix_from_path(cls):
         return cls.find_toolchain([cls.executable])
 
     def __init__(  # pylint: disable=too-many-arguments
-        self, output_path, prefix, num_threads, gui=False, viewer_fmt=None, viewer_args="", viewer=None
+        self, output_path, prefix, *, num_threads, gui=False, viewer_fmt=None, viewer_args="", viewer=None
     ):
         SimulatorInterface.__init__(self, output_path, gui)
         if viewer_fmt == "ghw":
@@ -305,9 +305,12 @@ def simulate(
             status = False
 
         if config.sim_options.get(self.name + ".gtkwave_script.gui", None):
-            LOGGER.warning("%s.gtkwave_script.gui is deprecated and will be removed "
-                           "in a future version, use %s.viewer_script.gui instead",
-                           self.name, self.name)
+            LOGGER.warning(
+                "%s.gtkwave_script.gui is deprecated and will be removed "
+                "in a future version, use %s.viewer_script.gui instead",
+                self.name,
+                self.name,
+            )
 
         if self._gui and not elaborate_only:
             cmd = [self._get_viewer(config)] + shlex.split(self._viewer_args) + [str(wave_file)]

vunit/source_file.py

@@ -129,6 +129,7 @@ def __init__(  # pylint: disable=too-many-arguments
         file_type,
         name,
         library,
+        *,
         verilog_parser,
         database,
         include_dirs=None,
@@ -206,6 +207,7 @@ def __init__(  # pylint: disable=too-many-arguments
         self,
         name: Union[str, Path],
         library: Library,
+        *,
         vhdl_parser,
         database,
         vhdl_standard: VHDLStandard,
@@ -311,16 +313,20 @@ def _find_design_units(self, design_file):
                     architecture.identifier,
                     self,
                     "architecture",
-                    False,
-                    architecture.entity,
+                    is_primary=False,
+                    primary_design_unit=architecture.entity,
                 )
             )
 
         for configuration in design_file.configurations:
             result.append(VHDLDesignUnit(configuration.identifier, self, "configuration"))
 
         for body in design_file.package_bodies:
-            result.append(VHDLDesignUnit(body.identifier, self, "package body", False, body.identifier))
+            result.append(
+                VHDLDesignUnit(
+                    body.identifier, self, "package body", is_primary=False, primary_design_unit=body.identifier
+                )
+            )
 
         return result
 

vunit/test/bench.py

@@ -229,6 +229,7 @@ def set_attribute(self, name, value):
     def add_config(  # pylint: disable=too-many-arguments
         self,
         name,
+        *,
         generics=None,
         pre_config=None,
         post_check=None,
@@ -257,7 +258,15 @@ def add_config(  # pylint: disable=too-many-arguments
                 self._individual_tests = not run_all_in_same_sim and len(self._test_cases) > 0
                 del attributes["run_all_in_same_sim"]
 
-        super().add_config(name, generics, pre_config, post_check, sim_options, attributes, vhdl_configuration_name)
+        super().add_config(
+            name,
+            generics=generics,
+            pre_config=pre_config,
+            post_check=post_check,
+            sim_options=sim_options,
+            attributes=attributes,
+            vhdl_configuration_name=vhdl_configuration_name,
+        )
 
 
 class FileLocation(object):

vunit/test/runner.py

@@ -39,6 +39,7 @@ def __init__(  # pylint: disable=too-many-arguments
         self,
         report,
         output_path,
+        *,
         verbosity=VERBOSITY_NORMAL,
         num_threads=1,
         fail_fast=False,
@@ -193,7 +194,9 @@ def _get_output_path(self, test_suite_name):
 
         return str(Path(output_path) / full_name)
 
-    def _add_skipped_tests(self, test_suite, results, start_time, num_tests, output_file_name):
+    def _add_skipped_tests(
+        self, test_suite, results, start_time, num_tests, output_file_name
+    ):  # pylint: disable=too-many-positional-arguments
         """
         Add skipped tests
         """
@@ -203,7 +206,7 @@ def _add_skipped_tests(self, test_suite, results, start_time, num_tests, output_
 
     def _run_test_suite(  # pylint: disable=too-many-locals
         self, test_suite, write_stdout, num_tests, output_path, output_file_name
-    ):
+    ):  # pylint: disable=too-many-positional-arguments
         """
         Run the actual test suite
         """
@@ -313,7 +316,9 @@ def _print_output(self, output_file_name):
             for line in fread.readlines():
                 self._stdout_ansi.write(line)
 
-    def _add_results(self, test_suite, results, start_time, num_tests, output_file_name):
+    def _add_results(
+        self, test_suite, results, start_time, num_tests, output_file_name
+    ):  # pylint: disable=too-many-positional-arguments
         """
         Add results to test report
         """

vunit/test/suites.py

@@ -149,7 +149,7 @@ class TestRun(object):
     A single simulation run yielding the results for one or several test cases
     """
 
-    def __init__(self, simulator_if, config, elaborate_only, test_suite_name, test_cases):
+    def __init__(self, *, simulator_if, config, elaborate_only, test_suite_name, test_cases):
         self._simulator_if = simulator_if
         self._config = config
         self._elaborate_only = elaborate_only

vunit/ui/__init__.py

@@ -518,7 +518,7 @@ def get_source_files(
 
         return SourceFileList(results)
 
-    def add_source_files(  # pylint: disable=too-many-arguments
+    def add_source_files(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         pattern,
         library_name: str,
@@ -563,7 +563,7 @@ def add_source_files(  # pylint: disable=too-many-arguments
             file_type=file_type,
         )
 
-    def add_source_file(  # pylint: disable=too-many-arguments
+    def add_source_file(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         file_name: Union[str, Path],
         library_name: str,

vunit/ui/library.py

@@ -329,7 +329,7 @@ def get_source_files(self, pattern="*", allow_empty=False):
         """
         return self._parent.get_source_files(pattern, self._library_name, allow_empty)
 
-    def add_source_files(  # pylint: disable=too-many-arguments
+    def add_source_files(  # pylint: disable=too-many-arguments, too-many-positional-arguments
         self,
         pattern,
         preprocessors=None,
@@ -375,7 +375,7 @@ def add_source_files(  # pylint: disable=too-many-arguments
             ]
         )
 
-    def add_source_file(  # pylint: disable=too-many-arguments
+    def add_source_file(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         file_name,
         preprocessors=None,

vunit/ui/test.py

@@ -27,7 +27,7 @@ def name(self):
         """
         return self._test_case.name
 
-    def add_config(  # pylint: disable=too-many-arguments
+    def add_config(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         name,
         generics=None,

vunit/ui/testbench.py

@@ -130,7 +130,7 @@ def set_post_check(self, value):
         """
         self._test_bench.set_post_check(value)
 
-    def add_config(  # pylint: disable=too-many-arguments
+    def add_config(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         self,
         name,
         generics=None,

vunit/vhdl_parser.py

@@ -49,6 +49,7 @@ class VHDLDesignFile(object):  # pylint: disable=too-many-instance-attributes
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
+        *,
         entities=None,
         packages=None,
         package_bodies=None,