From 2c6b802a72adefc44999e239f796efb112fd2571 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 12:02:40 +0200 Subject: [PATCH 1/3] upgrade Python version of the mypy CI workflow --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df93de4692e..61022a5be22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -320,7 +320,7 @@ jobs: type_check_python: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.10 steps: - apt_install: args: libturbojpeg-dev diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 6f013979771..614d61d8feb 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -320,7 +320,7 @@ jobs: type_check_python: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.10 steps: - apt_install: args: libturbojpeg-dev From 5a6d633096b76b1e9b3fe1d7d64059ecbc12e120 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 15:56:04 +0200 Subject: [PATCH 2/3] Revert "upgrade Python version of the mypy CI workflow" This reverts commit 2c6b802a72adefc44999e239f796efb112fd2571. --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61022a5be22..df93de4692e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -320,7 +320,7 @@ jobs: type_check_python: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.7 steps: - apt_install: args: libturbojpeg-dev diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 614d61d8feb..6f013979771 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -320,7 +320,7 @@ jobs: type_check_python: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.7 steps: - apt_install: args: libturbojpeg-dev From 6eb16aa377e5c7e4b9ee3677ad9d4df05294bb74 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 15:57:19 +0200 Subject: [PATCH 3/3] pin python version for mypy checks --- mypy.ini | 1 + torchvision/datasets/utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mypy.ini b/mypy.ini index 6d7863b627e..a55a5d27959 100644 --- a/mypy.ini +++ b/mypy.ini @@ -1,6 +1,7 @@ [mypy] files = torchvision +python_version = 3.10 show_error_codes = True pretty = True allow_redefinition = True diff --git a/torchvision/datasets/utils.py b/torchvision/datasets/utils.py index 06ceb7327c4..ddc11d350ef 100644 --- a/torchvision/datasets/utils.py +++ b/torchvision/datasets/utils.py @@ -66,7 +66,7 @@ def calculate_md5(fpath: str, chunk_size: int = 1024 * 1024) -> str: # Setting the `usedforsecurity` flag does not change anything about the functionality, but indicates that we are # not using the MD5 checksum for cryptography. This enables its usage in restricted environments like FIPS. Without # it torchvision.datasets is unusable in these environments since we perform a MD5 check everywhere. - md5 = hashlib.md5(**dict(usedforsecurity=False) if sys.version_info >= (3, 9) else dict()) + md5 = hashlib.md5(**dict(usedforsecurity=False) if sys.version_info >= (3, 9) else dict()) # type: ignore[arg-type] with open(fpath, "rb") as f: for chunk in iter(lambda: f.read(chunk_size), b""): md5.update(chunk)