Skip to content

Commit d5fe236

Browse files
Integrate mypy part 2: type check tools/ directory
1 parent a14dff8 commit d5fe236

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

analyzer/requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
# to let users select a specific compatible version.
66

77
lxml~=6.0
8+
lxml-stubs~=0.5.0
89
portalocker~=3.0
910
psutil~=7.0
1011
PyYAML~=6.0
1112
types-PyYAML~=6.0
1213
sarif-tools~=3.0
1314
multiprocess~=0.70
1415
setuptools~=80.0
16+
types-setuptools~=80.0
1517
semver~=3.0
1618
argcomplete~=3.0

pyproject.toml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,27 @@
22
verbosity = 1
33
show_error_codes = true
44

5+
# Packages are explicitly defined at mypy_path/<package_name>,
6+
# rather than discovered via __init__.py.
7+
explicit_package_bases = true
8+
59
files = [
6-
"codechecker_common/"
10+
"codechecker_common/",
11+
"tools/",
712
]
813

914
mypy_path = [
1015
"analyzer/",
1116
"web/",
1217
"tools/report-converter/"
1318
]
19+
20+
exclude = [
21+
# Ignore tests
22+
"tests/",
23+
24+
# Ignore build/ directories
25+
"tools/bazel/build/",
26+
"tools/report-converter/build/",
27+
"tools/tu_collector/build/",
28+
]

tools/report-converter/codechecker_report_converter/report/parser/sarif.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import logging
1111
import os
1212

13-
from sarif import loader
13+
from sarif import loader # type: ignore
1414

1515
from typing import Any, Dict, List, Optional, Tuple
1616

tools/tu_collector/tu_collector/tu_collector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def __eliminate_argument(
218218
except subprocess.CalledProcessError as ex:
219219
output, rc = ex.output, ex.returncode
220220
except OSError as oerr:
221-
output, rc = oerr.strerror, oerr.errno
221+
output, rc = oerr.strerror or "", oerr.errno or 1
222222

223223
if rc != 0:
224224
raise IOError(output)

0 commit comments

Comments
 (0)