mypy: zulip_bots: Fix errors in setup.py.

This commit is contained in:
Alena Volkova 2017-10-11 01:53:13 -04:00
parent 3d282a12a7
commit ad050fc806
3 changed files with 7 additions and 4 deletions

View file

@ -22,7 +22,6 @@ exclude = """
zulip/integrations/perforce/git_p4.py zulip/integrations/perforce/git_p4.py
zulip_bots/zulip_bots/bots zulip_bots/zulip_bots/bots
zulip_bots/setup.py
zulip_bots/zulip_bots/lib.py zulip_bots/zulip_bots/lib.py
zulip_bots/zulip_bots/provision.py zulip_bots/zulip_bots/provision.py
zulip_bots/zulip_bots/run.py zulip_bots/zulip_bots/run.py

View file

@ -5,7 +5,8 @@ import os
import glob import glob
import distutils.cmd import distutils.cmd
import distutils.log import distutils.log
from typing import IO, Iterator if False:
from typing import IO, Iterator
CURRENT_DIR = os.path.abspath(os.path.dirname(__file__)) CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))
BOTS_DIR = os.path.normpath(os.path.join(CURRENT_DIR, 'zulip_bots', 'bots')) BOTS_DIR = os.path.normpath(os.path.join(CURRENT_DIR, 'zulip_bots', 'bots'))

View file

@ -5,6 +5,8 @@ from __future__ import print_function
import os import os
import sys import sys
if False:
from typing import Any, Dict, Optional
import generate_manifest import generate_manifest
@ -63,14 +65,15 @@ except ImportError:
# Manual dependency check # Manual dependency check
def check_dependency_manually(module_name, version=None): def check_dependency_manually(module_name, version=None):
# type: (str, Optional[str]) -> None
try: try:
module = import_module(module_name) module = import_module(module_name) # type: Any
if version is not None: if version is not None:
assert(LooseVersion(module.__version__) >= LooseVersion(version)) assert(LooseVersion(module.__version__) >= LooseVersion(version))
except (ImportError, AssertionError): except (ImportError, AssertionError):
if version is not None: if version is not None:
print("{name}>={version} is not installed.".format( print("{name}>={version} is not installed.".format(
req=req, version=version), file=sys.stderr) name=module_name, version=version), file=sys.stderr)
else: else:
print("{name} is not installed.".format(name=module_name), file=sys.stderr) print("{name} is not installed.".format(name=module_name), file=sys.stderr)
sys.exit(1) sys.exit(1)