More type hint workarounds

src/peakrdl_regblock/struct_generator.py

@@ -2,7 +2,7 @@ from typing import TYPE_CHECKING, Optional, List
 import textwrap
 from collections import OrderedDict
 
-from systemrdl.walker import RDLListener, RDLWalker, WalkerAction
+from systemrdl.walker import RDLListener, RDLWalker
 
 from .identifier_filter import kw_filter as kwf
 

tests/requirements.txt

@@ -8,3 +8,4 @@ pylint
 mypy
 pytest-cov
 coveralls>=3.0.0
+types-setuptools

tests/run.sh

@@ -5,23 +5,25 @@ set -e
 cd "$(dirname "$0")"
 
 # Initialize venv
+rm -rf .venv
 python3 -m venv .venv
 source .venv/bin/activate
 
 # Install test dependencies
 pip install -r requirements.txt
 
+# Run static type checking prior to installing to avoid sloppy type hints of
+# systemrdl package
+mypy ../src/peakrdl_regblock
+
 # Install dut
 pip install -U ..
 
+# Run lint
+pylint --rcfile pylint.rc ../src/peakrdl_regblock
+
 # Run unit tests
 pytest --workers auto --cov=peakrdl_regblock --synth-tool skip
 
 # Generate coverage report
 coverage html -i -d htmlcov
-
-# Run lint
-pylint --rcfile pylint.rc ../src/peakrdl_regblock
-
-# Run static type checking
-mypy ../src/peakrdl_regblock