From b935c8310ca755851f523af5aeb3a6f120b95abf Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Thu, 27 Jan 2022 17:57:08 +0100 Subject: [PATCH 1/3] run mypy on Python 3.9 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1ddaf861ac..00522024ea8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,7 +297,7 @@ jobs: type_check_python: docker: - - image: circleci/python:3.7 + - image: circleci/python:3.9 steps: - apt_install: args: libturbojpeg-dev From 4574b38cba6c771f37bd8f5e3df4cde8e6eff2f2 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Fri, 28 Jan 2022 08:25:07 +0100 Subject: [PATCH 2/3] appease mypy --- setup.py | 1 + torchvision/datasets/stl10.py | 4 +++- torchvision/transforms/functional_pil.py | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 70ba0aa2e50..8498354adb9 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,7 @@ def write_version_file(): pytorch_dep += "==" + os.getenv("PYTORCH_VERSION") requirements = [ + "typing_extensions", "numpy", "requests", pytorch_dep, diff --git a/torchvision/datasets/stl10.py b/torchvision/datasets/stl10.py index bf7db144b8a..1ef50cf0a24 100644 --- a/torchvision/datasets/stl10.py +++ b/torchvision/datasets/stl10.py @@ -1,5 +1,5 @@ import os.path -from typing import Any, Callable, Optional, Tuple +from typing import Any, Callable, Optional, Tuple, cast import numpy as np from PIL import Image @@ -65,10 +65,12 @@ def __init__( self.labels: Optional[np.ndarray] if self.split == "train": self.data, self.labels = self.__loadfile(self.train_list[0][0], self.train_list[1][0]) + self.labels = cast(np.ndarray, self.labels) self.__load_folds(folds) elif self.split == "train+unlabeled": self.data, self.labels = self.__loadfile(self.train_list[0][0], self.train_list[1][0]) + self.labels = cast(np.ndarray, self.labels) self.__load_folds(folds) unlabeled_data, _ = self.__loadfile(self.train_list[2][0]) self.data = np.concatenate((self.data, unlabeled_data)) diff --git a/torchvision/transforms/functional_pil.py b/torchvision/transforms/functional_pil.py index fdaf5f7de1a..fb70d1969dc 100644 --- a/torchvision/transforms/functional_pil.py +++ b/torchvision/transforms/functional_pil.py @@ -4,6 +4,7 @@ import numpy as np import torch from PIL import Image, ImageOps, ImageEnhance +from typing_extensions import Literal try: import accimage @@ -130,7 +131,7 @@ def pad( img: Image.Image, padding: Union[int, List[int], Tuple[int, ...]], fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, - padding_mode: str = "constant", + padding_mode: Literal["constant", "edge", "reflect", "symmetric"] = "constant", ) -> Image.Image: if not _is_pil_image(img): @@ -189,7 +190,7 @@ def pad( if img.mode == "P": palette = img.getpalette() img = np.asarray(img) - img = np.pad(img, ((pad_top, pad_bottom), (pad_left, pad_right)), padding_mode) + img = np.pad(img, ((pad_top, pad_bottom), (pad_left, pad_right)), mode=padding_mode) img = Image.fromarray(img) img.putpalette(palette) return img From c51fafae09d3e0e7a765745363e6cbe9e71f1282 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Fri, 28 Jan 2022 08:38:32 +0100 Subject: [PATCH 3/3] Revert "run mypy on Python 3.9" This reverts commit b935c8310ca755851f523af5aeb3a6f120b95abf. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00522024ea8..f1ddaf861ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -297,7 +297,7 @@ jobs: type_check_python: docker: - - image: circleci/python:3.9 + - image: circleci/python:3.7 steps: - apt_install: args: libturbojpeg-dev