diff --git a/requirements/dev.txt b/requirements/dev.txt index bcf0d89e0e..1ba16797b8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -80,7 +80,7 @@ markdown==2.6.9 markupsafe==1.0 mock==2.0.0 moto==1.1.24 -mypy==0.540 +mypy==0.550 mypy_extensions==0.3.0 ndg-httpsclient==0.4.3 oauth2client==4.1.2 @@ -98,6 +98,7 @@ pip-tools==1.10.1 polib==1.0.8 premailer==3.1.1 prompt-toolkit==1.0.15 # via ipython +psutil==5.4.1 # via mypy psycopg2==2.7.3.2 ptyprocess==0.5.2 # via pexpect py3dns==3.1.0 diff --git a/requirements/mypy.in b/requirements/mypy.in index f6893db908..ae1cd36197 100644 --- a/requirements/mypy.in +++ b/requirements/mypy.in @@ -2,7 +2,7 @@ # /tools/update-locked-requirements to update requirements/dev.txt # and requirements/mypy.txt. # See requirements/README.md for more detail. -mypy==0.540 +mypy==0.550 # Include typing explicitly, since it's needed on Python 3.4 typing==3.6.2 diff --git a/requirements/mypy.txt b/requirements/mypy.txt index 27018f96e2..16556e5a9e 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -7,6 +7,7 @@ # # For details, see requirements/README.md . # -mypy==0.540 +mypy==0.550 +psutil==5.4.1 # via mypy typed-ast==1.1.0 # via mypy typing==3.6.2 diff --git a/tools/run-mypy b/tools/run-mypy index 93f20b56a3..d4692b53a3 100755 --- a/tools/run-mypy +++ b/tools/run-mypy @@ -88,7 +88,7 @@ extra_args = ["--check-untyped-defs", "--follow-imports=silent", "--scripts-are-modules", "-i", "--cache-dir=var/mypy-cache", - "--disallow-any=generics"] + "--disallow-any-generics"] if args.linecoverage_report: extra_args.append("--linecoverage-report") extra_args.append("var/linecoverage-report") diff --git a/version.py b/version.py index 41667c82a6..3b95df0375 100644 --- a/version.py +++ b/version.py @@ -1,3 +1,3 @@ ZULIP_VERSION = "1.7.1+git" -PROVISION_VERSION = '12.2' +PROVISION_VERSION = '13.0' diff --git a/zerver/management/commands/email_mirror.py b/zerver/management/commands/email_mirror.py index 597fcf6e3a..ceadd5ffd1 100644 --- a/zerver/management/commands/email_mirror.py +++ b/zerver/management/commands/email_mirror.py @@ -51,13 +51,13 @@ def get_imap_messages() -> Generator[Message, None, None]: try: mbox.select(settings.EMAIL_GATEWAY_IMAP_FOLDER) try: - status, num_ids_data = mbox.search(None, 'ALL') # type: bytes, List[bytes] + status, num_ids_data = mbox.search(None, 'ALL') # type: ignore # https://github.com/python/typeshed/pull/1762 for msgid in num_ids_data[0].split(): status, msg_data = mbox.fetch(msgid, '(RFC822)') msg_as_bytes = msg_data[0][1] message = email.message_from_bytes(msg_as_bytes) yield message - mbox.store(msgid, '+FLAGS', '\\Deleted') + mbox.store(msgid, '+FLAGS', '\\Deleted') # type: ignore # https://github.com/python/typeshed/pull/1762 mbox.expunge() finally: mbox.close()