diff --git a/mypy.ini b/mypy.ini index a5e2bb6ac9..1c36f6ba6d 100644 --- a/mypy.ini +++ b/mypy.ini @@ -62,7 +62,7 @@ ignore_missing_imports = True [mypy-linter_lib.printer] ignore_missing_imports = True -[mypy-lister,.lister] +[mypy-zulint,zulint.lister,zulint.lister.*] ignore_missing_imports = True diff --git a/tools/check-templates b/tools/check-templates index 78d127386b..ee0e949f82 100755 --- a/tools/check-templates +++ b/tools/check-templates @@ -10,7 +10,7 @@ import logging from lib import sanity_check sanity_check.check_venv(__file__) -import lister +from zulint import lister from typing import cast, Callable, Dict, Iterable, List EXCLUDED_FILES = [ diff --git a/tools/html-grep b/tools/html-grep index 2fe5826048..881aa41b9b 100755 --- a/tools/html-grep +++ b/tools/html-grep @@ -9,7 +9,7 @@ from typing import List from lib import sanity_check sanity_check.check_venv(__file__) -import lister +from zulint import lister USAGE = ''' This file greps HTML files for keywords in a context-sensitive manner. diff --git a/tools/lint b/tools/lint index 9e1a33a2ef..8e7c4cf08b 100755 --- a/tools/lint +++ b/tools/lint @@ -13,7 +13,7 @@ from linter_lib.printer import print_err, colors from lib import sanity_check sanity_check.check_venv(__file__) -import lister +from zulint import lister from typing import cast, Callable, Dict, Iterator, List diff --git a/tools/replacer b/tools/replacer index 95828daef3..9d73d252f4 100755 --- a/tools/replacer +++ b/tools/replacer @@ -4,7 +4,7 @@ import argparse from subprocess import check_call from typing import List, Dict, Union -from .lister import list_files +from zulint.lister import list_files def do_replace(listing, old_string, new_string): # type: (Union[Dict[str, List[str]], List[str]], str, str) -> None diff --git a/tools/run-mypy b/tools/run-mypy index ccf707cfe0..fafe3dd980 100755 --- a/tools/run-mypy +++ b/tools/run-mypy @@ -6,7 +6,7 @@ import sys import argparse import subprocess -import lister +from zulint import lister from typing import cast, Dict, List TOOLS_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/tools/zulint/__init__.py b/tools/zulint/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/lister.py b/tools/zulint/lister.py similarity index 100% rename from tools/lister.py rename to tools/zulint/lister.py