Run a type check on scripts and most of misc in CI (#13458)

AlexWaygood · web-flow · commit 5f488e200ee8 · 2022-08-20T10:03:15.000-07:00
diff --git a/misc/actions_stubs.py b/misc/actions_stubs.py
@@ -41,7 +41,7 @@ def apply_all(
             break
 
 
-def confirm(resp: bool = False, **kargs) -> bool:
+def confirm(resp: bool = False, **kargs: Any) -> bool:
     kargs["rest"] = "to this {f2}/*{e2}".format(**kargs) if kargs.get("f2") else ""
     prompt = "{act} all files {rec}matching this expression {f1}/*{e1} {rest}".format(**kargs)
     prompt.format(**kargs)
diff --git a/misc/analyze_cache.py b/misc/analyze_cache.py
@@ -30,7 +30,7 @@ def __init__(
         self.meta_size = meta_size
 
     @property
-    def total_size(self):
+    def total_size(self) -> int:
         return self.data_size + self.meta_size
 
 
@@ -75,7 +75,7 @@ def pluck(name: str, chunks: Iterable[JsonDict]) -> Iterable[JsonDict]:
     return (chunk for chunk in chunks if chunk[".class"] == name)
 
 
-def report_counter(counter: Counter, amount: int | None = None) -> None:
+def report_counter(counter: Counter[str], amount: int | None = None) -> None:
     for name, count in counter.most_common(amount):
         print(f"    {count: <8} {name}")
     print()
@@ -167,6 +167,7 @@ def main() -> None:
         if "build.*.json" in chunk.filename:
             build = chunk
             break
+    assert build is not None
     original = json.dumps(build.data, sort_keys=True)
     print(f"Size of build.data.json, in kilobytes: {len(original) / 1024:.3f}")
 
diff --git a/misc/async_matrix.py b/misc/async_matrix.py
@@ -106,7 +106,7 @@ async def decorated_host_coroutine(func) -> None:
 # Main driver.
 
 
-def main():
+def main() -> None:
     verbose = "-v" in sys.argv
     for host in [
         plain_host_generator,
diff --git a/misc/convert-cache.py b/misc/convert-cache.py
@@ -14,7 +14,7 @@
 
 import argparse
 
-from mypy.metastore import FilesystemMetadataStore, SqliteMetadataStore
+from mypy.metastore import FilesystemMetadataStore, MetadataStore, SqliteMetadataStore
 
 
 def main() -> None:
@@ -37,7 +37,8 @@ def main() -> None:
     input_dir = args.input_dir
     output_dir = args.output_dir or input_dir
     if args.to_sqlite:
-        input, output = FilesystemMetadataStore(input_dir), SqliteMetadataStore(output_dir)
+        input: MetadataStore = FilesystemMetadataStore(input_dir)
+        output: MetadataStore = SqliteMetadataStore(output_dir)
     else:
         input, output = SqliteMetadataStore(input_dir), FilesystemMetadataStore(output_dir)
 
diff --git a/misc/incremental_checker.py b/misc/incremental_checker.py
@@ -45,7 +45,7 @@
 import time
 from argparse import ArgumentParser, Namespace, RawDescriptionHelpFormatter
 from typing import Any, Dict, Tuple
-from typing_extensions import TypeAlias as _TypeAlias
+from typing_extensions import Final, TypeAlias as _TypeAlias
 
 CACHE_PATH: Final = ".incremental_checker_cache.json"
 MYPY_REPO_URL: Final = "https://github.com/python/mypy.git"
diff --git a/misc/touch_checker.py b/misc/touch_checker.py
@@ -79,7 +79,7 @@ def teardown() -> None:
             stream.write(copy)
 
         # Re-run to reset cache
-        execute(["python3", "-m", "mypy", "-i", "mypy"]),
+        execute(["python3", "-m", "mypy", "-i", "mypy"])
 
     return setup, teardown
 
diff --git a/misc/variadics.py b/misc/variadics.py
@@ -37,7 +37,7 @@ def expand_template(
     print(s)
 
 
-def main():
+def main() -> None:
     prelude(LIMIT, BOUND)
 
     # map()
diff --git a/scripts/find_type.py b/scripts/find_type.py
@@ -68,7 +68,7 @@ def process_output(output: str, filename: str, start_line: int) -> tuple[str | N
     return None, True  # finding no reveal_type is an error
 
 
-def main():
+def main() -> None:
     filename, start_line_str, start_col_str, end_line_str, end_col_str, *mypy_and_args = sys.argv[
         1:
     ]
diff --git a/tox.ini b/tox.ini
@@ -56,7 +56,8 @@ commands =
 description = type check ourselves
 commands =
     python -m mypy --config-file mypy_self_check.ini -p mypy -p mypyc
-    python -m mypy --config-file mypy_self_check.ini misc/proper_plugin.py
+    python -m mypy --config-file mypy_self_check.ini scripts
+    python -m mypy --config-file mypy_self_check.ini misc --exclude misc/fix_annotate.py --exclude misc/async_matrix.py
 
 [testenv:docs]
 description = invoke sphinx-build to build the HTML docs

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def process_output(output: str, filename: str, start_line: int) -> tuple[str \| N`
`68`	`68`	`return None, True # finding no reveal_type is an error`
`69`	`69`
`70`	`70`
`71`		`-def main():`
	`71`	`+def main() -> None:`
`72`	`72`	`filename, start_line_str, start_col_str, end_line_str, end_col_str, *mypy_and_args = sys.argv[`
`73`	`73`	`1:`
`74`	`74`	`]`