Fixed linting related to too many positional arguments

Author: LarsAsplund

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)]