Make tools/run-mypy pass mypy check.

This commit is contained in:
Eklavya Sharma 2016-07-24 13:08:08 +05:30
parent 3d87c376c2
commit ec6b630537
1 changed files with 10 additions and 7 deletions

View File

@ -10,6 +10,8 @@ import argparse
import subprocess import subprocess
import six import six
from typing import cast, Dict, List
TOOLS_DIR = os.path.dirname(os.path.abspath(__file__)) TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
os.chdir(os.path.dirname(TOOLS_DIR)) os.chdir(os.path.dirname(TOOLS_DIR))
@ -38,7 +40,7 @@ zerver/tests/test_messages.py
zerver/tests/test_narrow.py zerver/tests/test_narrow.py
""".split() """.split()
exclude_py2 = [] exclude_py2 = [] # type: List[str]
exclude_py3 = """ exclude_py3 = """
zerver/lib/ccache.py zerver/lib/ccache.py
@ -64,14 +66,13 @@ tools/deprecated/review
tools/get-handlebar-vars tools/get-handlebar-vars
tools/lint-all tools/lint-all
tools/minify-js tools/minify-js
tools/run-mypy
tools/test-js-with-casper tools/test-js-with-casper
tools/test-run-dev tools/test-run-dev
tools/update-deployment tools/update-deployment
tools/zulip-export/zulip-export tools/zulip-export/zulip-export
""".split() """.split()
exclude_scripts_py2 = [] exclude_scripts_py2 = [] # type: List[str]
exclude_scripts_py3 = """ exclude_scripts_py3 = """
bots/process_ccache bots/process_ccache
@ -106,7 +107,7 @@ else:
py_version = 2 py_version = 2
if args.all: if args.all:
exclude = [] exclude = [] # type: List[str]
elif args.scripts_only: elif args.scripts_only:
if py_version == 2: if py_version == 2:
exclude = exclude_scripts_common + exclude_scripts_py2 exclude = exclude_scripts_common + exclude_scripts_py2
@ -119,9 +120,11 @@ else:
exclude = exclude_common + exclude_py3 exclude = exclude_common + exclude_py3
# find all non-excluded files in current directory # find all non-excluded files in current directory
files_dict = lister.list_files(targets=args.targets, ftypes=['py', 'pyi'], use_shebang=args.scripts_only, files_dict = cast(Dict[str, List[str]],
modified_only=args.modified, exclude = exclude + ['stubs'], lister.list_files(targets=args.targets, ftypes=['py', 'pyi'],
group_by_ftype=True, extless_only=args.scripts_only) use_shebang=args.scripts_only, modified_only=args.modified,
exclude = exclude + ['stubs'], group_by_ftype=True,
extless_only=args.scripts_only))
pyi_files = set(files_dict['pyi']) pyi_files = set(files_dict['pyi'])
python_files = [fpath for fpath in files_dict['py'] python_files = [fpath for fpath in files_dict['py']
if not fpath.endswith('.py') or fpath + 'i' not in pyi_files] if not fpath.endswith('.py') or fpath + 'i' not in pyi_files]