From 5141f7c6992bcce637b029767f5bac36ff4ee9a8 Mon Sep 17 00:00:00 2001
From: Lars Asplund <lars.anders.asplund@gmail.com>
Date: Mon, 15 Mar 2021 19:57:43 +0100
Subject: [PATCH] Fixed lint issues.

---
 tests/lint/test_mypy.py                        | 2 +-
 tools/release.py                               | 2 +-
 vunit/parsing/tokenizer.py                     | 6 +++---
 vunit/vhdl/check/run.py                        | 7 ++-----
 vunit/vhdl/check/tools/generate_check_match.py | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/lint/test_mypy.py b/tests/lint/test_mypy.py
index d98cf2f51..becc6af87 100644
--- a/tests/lint/test_mypy.py
+++ b/tests/lint/test_mypy.py
@@ -20,4 +20,4 @@ class TestMyPy(unittest.TestCase):
 
     @staticmethod
     def test_mypy():
-        check_call([sys.executable, "-m", "mypy", "vunit"])
+        check_call([sys.executable, "-m", "mypy", "--namespace-packages", "vunit"])
diff --git a/tools/release.py b/tools/release.py
index c3cbc8f48..429e7cdb7 100755
--- a/tools/release.py
+++ b/tools/release.py
@@ -127,7 +127,7 @@ def parse_version(version_str):
     """
     Create a 3-element tuple with the major,minor,patch version
     """
-    return tuple([int(elem) for elem in version_str.split(".")])
+    return tuple((int(elem) for elem in version_str.split(".")))
 
 
 def set_version(version):
diff --git a/vunit/parsing/tokenizer.py b/vunit/parsing/tokenizer.py
index e76e59ee8..30d23b4d9 100644
--- a/vunit/parsing/tokenizer.py
+++ b/vunit/parsing/tokenizer.py
@@ -12,11 +12,11 @@
 import re
 from vunit.ostools import read_file, file_exists, simplify_path
 
-TokenType = collections.namedtuple("Token", ["kind", "value", "location"])
-
 
 def Token(kind, value="", location=None):  # pylint: disable=invalid-name
-    return TokenType(kind, value, location)
+    return collections.namedtuple("Token", ["kind", "value", "location"])(
+        kind, value, location
+    )
 
 
 class TokenKind:
diff --git a/vunit/vhdl/check/run.py b/vunit/vhdl/check/run.py
index 2e81cab18..35aefa96d 100644
--- a/vunit/vhdl/check/run.py
+++ b/vunit/vhdl/check/run.py
@@ -6,14 +6,11 @@
 
 from pathlib import Path
 from glob import glob
-import sys
 from vunit import VUnit, ROOT
 from vunit.check_preprocessor import CheckPreprocessor
 
-sys.path.append(str(Path(__file__).parent / "tools"))
-
-import generate_check_equal
-import generate_check_match
+import vunit.vhdl.check.tools.generate_check_equal as generate_check_equal
+import vunit.vhdl.check.tools.generate_check_match as generate_check_match
 
 generate_check_equal.main()
 generate_check_match.main()
diff --git a/vunit/vhdl/check/tools/generate_check_match.py b/vunit/vhdl/check/tools/generate_check_match.py
index 129755b50..08c3d04e7 100644
--- a/vunit/vhdl/check/tools/generate_check_match.py
+++ b/vunit/vhdl/check/tools/generate_check_match.py
@@ -6,7 +6,7 @@
 
 from pathlib import Path
 from string import Template
-from generate_check_equal import replace_region
+from vunit.vhdl.check.tools.generate_check_equal import replace_region
 
 api_template = """  procedure check_match(
     constant got       : in $got_type;