diff --git a/mypy.ini b/mypy.ini index dc277f2583..bc8fd8ead7 100644 --- a/mypy.ini +++ b/mypy.ini @@ -59,9 +59,6 @@ ignore_errors = True [mypy-lib,lib.*] ignore_missing_imports = True -[mypy-linter_lib.printer] -ignore_missing_imports = True - [mypy-zulint,zulint.*,zulint.lister.*] ignore_missing_imports = True diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py index 311d7bdb57..a7bdbfffe0 100644 --- a/tools/linter_lib/custom_check.py +++ b/tools/linter_lib/custom_check.py @@ -7,7 +7,7 @@ import os import re import traceback -from .printer import print_err, colors +from zulint.printer import print_err, colors from typing import cast, Any, Callable, Dict, List, Optional, Tuple, Iterable @@ -525,7 +525,7 @@ def build_custom_checkers(by_lang): # We are likely to want to keep these dirs Python 2+3 compatible, # since the plan includes extracting them to a separate project eventually. 'tools/lib', - 'tools/linter_lib', + 'tools/zulint', # TODO: Update our migrations from Text->str. 'zerver/migrations/', # thumbor is (currently) python2 only diff --git a/tools/linter_lib/pep8.py b/tools/linter_lib/pep8.py index 164cf6bc80..ad729dbeae 100644 --- a/tools/linter_lib/pep8.py +++ b/tools/linter_lib/pep8.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import subprocess -from .printer import print_err, colors +from zulint.printer import print_err, colors from typing import List diff --git a/tools/linter_lib/pyflakes.py b/tools/linter_lib/pyflakes.py index a81103d930..29a9245051 100644 --- a/tools/linter_lib/pyflakes.py +++ b/tools/linter_lib/pyflakes.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import subprocess -from .printer import print_err, colors +from zulint.printer import print_err, colors from typing import Any, Dict, List diff --git a/tools/zulint/command.py b/tools/zulint/command.py index 1e38891d42..6343fe6564 100644 --- a/tools/zulint/command.py +++ b/tools/zulint/command.py @@ -10,7 +10,7 @@ import subprocess import sys from typing import Any, Callable, Dict, List, Optional -from linter_lib.printer import print_err, colors +from zulint.printer import print_err, colors def add_default_linter_arguments(parser): # type: (argparse.ArgumentParser) -> None diff --git a/tools/linter_lib/printer.py b/tools/zulint/printer.py similarity index 100% rename from tools/linter_lib/printer.py rename to tools/zulint/printer.py