diff options
| -rwxr-xr-x | contrib/devtools/circular-dependencies.py | 7 | ||||
| -rwxr-xr-x | contrib/devtools/symbol-check.py | 14 | ||||
| -rwxr-xr-x | test/lint/lint-python.sh | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/contrib/devtools/circular-dependencies.py b/contrib/devtools/circular-dependencies.py index bc5f09a3e2..6dc4e83ee7 100755 --- a/contrib/devtools/circular-dependencies.py +++ b/contrib/devtools/circular-dependencies.py @@ -5,6 +5,7 @@ import sys import re +from typing import Dict, List, Set MAPPING = { 'core_read.cpp': 'core_io.cpp', @@ -32,7 +33,7 @@ def module_name(path): return None files = dict() -deps = dict() +deps: Dict[str, Set[str]] = dict() RE = re.compile("^#include <(.*)>") @@ -59,12 +60,12 @@ for arg in sorted(files.keys()): deps[module].add(included_module) # Loop to find the shortest (remaining) circular dependency -have_cycle = False +have_cycle: bool = False while True: shortest_cycle = None for module in sorted(deps.keys()): # Build the transitive closure of dependencies of module - closure = dict() + closure: Dict[str, List[str]] = dict() for dep in deps[module]: closure[dep] = [] while True: diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 91c7e32578..b30ed62521 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -157,7 +157,7 @@ def check_version(max_versions, version, arch) -> bool: def check_imported_symbols(filename) -> bool: elf = pixie.load(filename) cppfilt = CPPFilt() - ok = True + ok: bool = True for symbol in elf.dyn_symbols: if not symbol.is_import: @@ -172,7 +172,7 @@ def check_imported_symbols(filename) -> bool: def check_exported_symbols(filename) -> bool: elf = pixie.load(filename) cppfilt = CPPFilt() - ok = True + ok: bool = True for symbol in elf.dyn_symbols: if not symbol.is_export: continue @@ -184,7 +184,7 @@ def check_exported_symbols(filename) -> bool: return ok def check_ELF_libraries(filename) -> bool: - ok = True + ok: bool = True elf = pixie.load(filename) for library_name in elf.query_dyn_tags(pixie.DT_NEEDED): assert(isinstance(library_name, bytes)) @@ -207,7 +207,7 @@ def macho_read_libraries(filename) -> List[str]: return libraries def check_MACHO_libraries(filename) -> bool: - ok = True + ok: bool = True for dylib in macho_read_libraries(filename): if dylib not in MACHO_ALLOWED_LIBRARIES: print('{} is not in ALLOWED_LIBRARIES!'.format(dylib)) @@ -227,7 +227,7 @@ def pe_read_libraries(filename) -> List[str]: return libraries def check_PE_libraries(filename) -> bool: - ok = True + ok: bool = True for dylib in pe_read_libraries(filename): if dylib not in PE_ALLOWED_LIBRARIES: print('{} is not in ALLOWED_LIBRARIES!'.format(dylib)) @@ -260,7 +260,7 @@ def identify_executable(executable) -> Optional[str]: return None if __name__ == '__main__': - retval = 0 + retval: int = 0 for filename in sys.argv[1:]: try: etype = identify_executable(filename) @@ -269,7 +269,7 @@ if __name__ == '__main__': retval = 1 continue - failed = [] + failed: List[str] = [] for (name, func) in CHECKS[etype]: if not func(filename): failed.append(name) diff --git a/test/lint/lint-python.sh b/test/lint/lint-python.sh index 4fc130497b..f83c33cb32 100755 --- a/test/lint/lint-python.sh +++ b/test/lint/lint-python.sh @@ -102,7 +102,7 @@ if ! PYTHONWARNINGS="ignore" flake8 --ignore=B,C,E,F,I,N,W --select=$(IFS=","; e EXIT_CODE=1 fi -if ! mypy --ignore-missing-imports $(git ls-files "test/functional/*.py"); then +if ! mypy --ignore-missing-imports $(git ls-files "test/functional/*.py" "contrib/devtools/*.py"); then EXIT_CODE=1 fi |