From d72812739ff919912b2c589875a652e089870621 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Mon, 11 Apr 2022 08:55:03 +0200 Subject: [PATCH 01/18] upgrade prototype test CI from 3.7 to 3.10 --- .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..b8eb3dd5d33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.10 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 6f013979771..5659a1168ae 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.10 resource_class: xlarge steps: - checkout From 7fe20b69de91307fc0f3ec40b42a5175de0de9e4 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 13 Apr 2022 08:48:17 +0200 Subject: [PATCH 02/18] try force garbage collection for reproducibility --- test/test_prototype_builtin_datasets.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index fc2ebd9aa38..dc76fab0f40 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -1,4 +1,5 @@ import functools +import gc import io import pickle from pathlib import Path @@ -31,6 +32,12 @@ def test_home(mocker, tmp_path): yield tmp_path +@pytest.fixture(autouse=True) +def garbage_collection(): + yield + gc.collect() + + def test_coverage(): untested_datasets = set(datasets.list_datasets()) - DATASET_MOCKS.keys() if untested_datasets: From 2c5d53df0036da0d51f9b708cd964dbf98ed58ec Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Tue, 19 Apr 2022 14:22:40 +0200 Subject: [PATCH 03/18] confirm error on data in buffer --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- test/test_prototype_builtin_datasets.py | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8eb3dd5d33..e623a4c1b88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_*.py + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample unittest_extended: docker: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 5659a1168ae..b4031d0ed32 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_*.py + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample unittest_extended: docker: diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index dc76fab0f40..e327dff5ecd 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -1,3 +1,4 @@ +import contextlib import functools import gc import io @@ -9,6 +10,7 @@ from builtin_dataset_mocks import parametrize_dataset_mocks, DATASET_MOCKS from torch.testing._comparison import assert_equal, TensorLikePair, ObjectPair from torch.utils.data import DataLoader +from torch.utils.data.datapipes.iter.combining import _DemultiplexerIterDataPipe from torch.utils.data.graph import traverse from torch.utils.data.graph_settings import get_all_graph_pipes from torchdata.datapipes.iter import Shuffler, ShardingFilter @@ -82,6 +84,11 @@ def test_sample(self, test_home, dataset_mock, config): except Exception as error: raise AssertionError("Drawing a sample raised the error above.") from error + with contextlib.suppress(StopIteration): + demux = next(dp for dp in extract_datapipes(dataset) if isinstance(dp, _DemultiplexerIterDataPipe)) + if any(bool(buffer) for buffer in demux.child_buffers): + print("Found some data in the buffer") + if not isinstance(sample, dict): raise AssertionError(f"Samples should be dictionaries, but got {type(sample)} instead.") From 3174d0ffcb32292405ea3c07673e3a81ef044c36 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Tue, 19 Apr 2022 17:32:01 +0200 Subject: [PATCH 04/18] try closing all demux child buffers --- test/test_prototype_builtin_datasets.py | 12 +++++++----- torchvision/transforms/functional_pil.py | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index e327dff5ecd..f31b61d3acf 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -1,7 +1,7 @@ -import contextlib import functools import gc import io +import itertools import pickle from pathlib import Path @@ -84,10 +84,12 @@ def test_sample(self, test_home, dataset_mock, config): except Exception as error: raise AssertionError("Drawing a sample raised the error above.") from error - with contextlib.suppress(StopIteration): - demux = next(dp for dp in extract_datapipes(dataset) if isinstance(dp, _DemultiplexerIterDataPipe)) - if any(bool(buffer) for buffer in demux.child_buffers): - print("Found some data in the buffer") + for dp in extract_datapipes(dataset): + if not isinstance(dp, _DemultiplexerIterDataPipe): + continue + + for _, buffer in itertools.chain.from_iterable(dp.child_buffers): + buffer.close() if not isinstance(sample, dict): raise AssertionError(f"Samples should be dictionaries, but got {type(sample)} instead.") diff --git a/torchvision/transforms/functional_pil.py b/torchvision/transforms/functional_pil.py index 5362ebd593c..9870540fb4a 100644 --- a/torchvision/transforms/functional_pil.py +++ b/torchvision/transforms/functional_pil.py @@ -240,7 +240,7 @@ def crop( def resize( img: Image.Image, size: Union[Sequence[int], int], - interpolation: int = Image.BILINEAR, + interpolation: int = Image.Resampling.BILINEAR, max_size: Optional[int] = None, ) -> Image.Image: @@ -314,7 +314,7 @@ def _parse_fill( def affine( img: Image.Image, matrix: List[float], - interpolation: int = Image.NEAREST, + interpolation: int = Image.Resampling.NEAREST, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, ) -> Image.Image: @@ -330,7 +330,7 @@ def affine( def rotate( img: Image.Image, angle: float, - interpolation: int = Image.NEAREST, + interpolation: int = Image.Resampling.NEAREST, expand: bool = False, center: Optional[Tuple[int, int]] = None, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, @@ -347,7 +347,7 @@ def rotate( def perspective( img: Image.Image, perspective_coeffs: float, - interpolation: int = Image.BICUBIC, + interpolation: int = Image.Resampling.BICUBIC, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, ) -> Image.Image: From ce922ccf835142e76fabc935f60f3e77610fdc00 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 09:18:50 +0200 Subject: [PATCH 05/18] try clear demux buffers --- test/test_prototype_builtin_datasets.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index f31b61d3acf..a5f53d71ad8 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -1,7 +1,6 @@ import functools import gc import io -import itertools import pickle from pathlib import Path @@ -88,8 +87,8 @@ def test_sample(self, test_home, dataset_mock, config): if not isinstance(dp, _DemultiplexerIterDataPipe): continue - for _, buffer in itertools.chain.from_iterable(dp.child_buffers): - buffer.close() + for dq in dp.child_buffers: + dq.clear() if not isinstance(sample, dict): raise AssertionError(f"Samples should be dictionaries, but got {type(sample)} instead.") From 7e3f5ba9fe440f598095409c1ec5b2d0c6d5f361 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:03:56 +0200 Subject: [PATCH 06/18] try run DTD selective --- .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 e623a4c1b88..f4e5efbb669 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample -k dtd unittest_extended: docker: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index b4031d0ed32..05f26b48a1a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample -k dtd unittest_extended: docker: From 42c5e5c7bb087c13c50773485e8772d8493fdb09 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:11:21 +0200 Subject: [PATCH 07/18] change to python 3.8 --- .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 f4e5efbb669..1fa8597c813 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.8 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 05f26b48a1a..6595a656a41 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.8 resource_class: xlarge steps: - checkout From 9222c210b2bfef446499dbe2fe097ea1edabaa7f Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:18:38 +0200 Subject: [PATCH 08/18] run all datasets again --- .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 1fa8597c813..54419b12fa4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample -k dtd + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample unittest_extended: docker: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 6595a656a41..a0cdd0e5578 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -369,7 +369,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample -k dtd + file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample unittest_extended: docker: From 0bdc6655a2ea11129e619e3a092d6d66c378ccf6 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:37:40 +0200 Subject: [PATCH 09/18] remove unrelated change --- test/test_prototype_builtin_datasets.py | 12 ++++++------ torchvision/transforms/functional_pil.py | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index a5f53d71ad8..3a2e21931e7 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -83,12 +83,12 @@ def test_sample(self, test_home, dataset_mock, config): except Exception as error: raise AssertionError("Drawing a sample raised the error above.") from error - for dp in extract_datapipes(dataset): - if not isinstance(dp, _DemultiplexerIterDataPipe): - continue - - for dq in dp.child_buffers: - dq.clear() + # for dp in extract_datapipes(dataset): + # if not isinstance(dp, _DemultiplexerIterDataPipe): + # continue + # + # for dq in dp.child_buffers: + # dq.clear() if not isinstance(sample, dict): raise AssertionError(f"Samples should be dictionaries, but got {type(sample)} instead.") diff --git a/torchvision/transforms/functional_pil.py b/torchvision/transforms/functional_pil.py index 9870540fb4a..5362ebd593c 100644 --- a/torchvision/transforms/functional_pil.py +++ b/torchvision/transforms/functional_pil.py @@ -240,7 +240,7 @@ def crop( def resize( img: Image.Image, size: Union[Sequence[int], int], - interpolation: int = Image.Resampling.BILINEAR, + interpolation: int = Image.BILINEAR, max_size: Optional[int] = None, ) -> Image.Image: @@ -314,7 +314,7 @@ def _parse_fill( def affine( img: Image.Image, matrix: List[float], - interpolation: int = Image.Resampling.NEAREST, + interpolation: int = Image.NEAREST, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, ) -> Image.Image: @@ -330,7 +330,7 @@ def affine( def rotate( img: Image.Image, angle: float, - interpolation: int = Image.Resampling.NEAREST, + interpolation: int = Image.NEAREST, expand: bool = False, center: Optional[Tuple[int, int]] = None, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, @@ -347,7 +347,7 @@ def rotate( def perspective( img: Image.Image, perspective_coeffs: float, - interpolation: int = Image.Resampling.BICUBIC, + interpolation: int = Image.BICUBIC, fill: Optional[Union[float, List[float], Tuple[float, ...]]] = 0, ) -> Image.Image: From 318f002ce0ea6169fe2697b1670f2d7c1fcd14a1 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:38:16 +0200 Subject: [PATCH 10/18] remove manually clearing of demux buffers --- test/test_prototype_builtin_datasets.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index 3a2e21931e7..dc76fab0f40 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -9,7 +9,6 @@ from builtin_dataset_mocks import parametrize_dataset_mocks, DATASET_MOCKS from torch.testing._comparison import assert_equal, TensorLikePair, ObjectPair from torch.utils.data import DataLoader -from torch.utils.data.datapipes.iter.combining import _DemultiplexerIterDataPipe from torch.utils.data.graph import traverse from torch.utils.data.graph_settings import get_all_graph_pipes from torchdata.datapipes.iter import Shuffler, ShardingFilter @@ -83,13 +82,6 @@ def test_sample(self, test_home, dataset_mock, config): except Exception as error: raise AssertionError("Drawing a sample raised the error above.") from error - # for dp in extract_datapipes(dataset): - # if not isinstance(dp, _DemultiplexerIterDataPipe): - # continue - # - # for dq in dp.child_buffers: - # dq.clear() - if not isinstance(sample, dict): raise AssertionError(f"Samples should be dictionaries, but got {type(sample)} instead.") From e052d0fc5a1af142a312f4b98b19d4275031da33 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 11:45:52 +0200 Subject: [PATCH 11/18] do not fail on warning but show traceback instead --- .circleci/config.yml | 2 ++ .circleci/config.yml.in | 2 ++ test/test_prototype_builtin_datasets.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54419b12fa4..2c7c8e8103a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,6 +174,8 @@ commands: - run: name: Run tests command: pytest --junitxml=test-results/junit.xml -v --durations 20 <> + environment: + PYTHONTRACEMALLOC: 20 - store_test_results: path: test-results diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index a0cdd0e5578..59b4aee4b0f 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -174,6 +174,8 @@ commands: - run: name: Run tests command: pytest --junitxml=test-results/junit.xml -v --durations 20 <> + environment: + PYTHONTRACEMALLOC: 20 - store_test_results: path: test-results diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index dc76fab0f40..e5b7697667b 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -48,7 +48,7 @@ def test_coverage(): ) -@pytest.mark.filterwarnings("error") +# @pytest.mark.filterwarnings("error") class TestCommon: @pytest.mark.parametrize("name", datasets.list_datasets()) def test_info(self, name): From c53d1841810e85685b1e85281db986b622205682 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:15:08 +0200 Subject: [PATCH 12/18] ignore ResourceWarning --- test/test_prototype_builtin_datasets.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index e5b7697667b..f731ba47774 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -1,5 +1,4 @@ import functools -import gc import io import pickle from pathlib import Path @@ -32,12 +31,6 @@ def test_home(mocker, tmp_path): yield tmp_path -@pytest.fixture(autouse=True) -def garbage_collection(): - yield - gc.collect() - - def test_coverage(): untested_datasets = set(datasets.list_datasets()) - DATASET_MOCKS.keys() if untested_datasets: @@ -48,7 +41,8 @@ def test_coverage(): ) -# @pytest.mark.filterwarnings("error") +@pytest.mark.filterwarnings("ignore::ResourceWarning") +@pytest.mark.filterwarnings("error") class TestCommon: @pytest.mark.parametrize("name", datasets.list_datasets()) def test_info(self, name): From bc6905c07ef80d39a578935a6db5c11b6daaadab Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:16:02 +0200 Subject: [PATCH 13/18] revert CI changes other than Python version --- .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 2c7c8e8103a..24e6ee0685a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -371,7 +371,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample + file_or_dir: test/test_prototype_*.py unittest_extended: docker: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 59b4aee4b0f..e24ac3faf0a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -371,7 +371,7 @@ jobs: args: scipy pycocotools h5py descr: Install optional dependencies - run_tests_selective: - file_or_dir: test/test_prototype_builtin_datasets.py::TestCommon::test_sample + file_or_dir: test/test_prototype_*.py unittest_extended: docker: From 162679276b1b5242a63d03f7ab67d2571cbe94d2 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:17:04 +0200 Subject: [PATCH 14/18] more revert --- .circleci/config.yml | 2 -- .circleci/config.yml.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24e6ee0685a..88068f34768 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,8 +174,6 @@ commands: - run: name: Run tests command: pytest --junitxml=test-results/junit.xml -v --durations 20 <> - environment: - PYTHONTRACEMALLOC: 20 - store_test_results: path: test-results diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index e24ac3faf0a..1ad6b9c9148 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -174,8 +174,6 @@ commands: - run: name: Run tests command: pytest --junitxml=test-results/junit.xml -v --durations 20 <> - environment: - PYTHONTRACEMALLOC: 20 - store_test_results: path: test-results From e54fcc3d5bc3b33a773286145a2612376c5a7b8f Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:31:48 +0200 Subject: [PATCH 15/18] try 3.9 --- .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 88068f34768..852554b0ffe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.8 + - image: cimg/python:3.9 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 1ad6b9c9148..e82c7ec0356 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.8 + - image: cimg/python:3.9 resource_class: xlarge steps: - checkout From bb7158e08387872337088dfbe5a4fd6af14f635a Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:34:32 +0200 Subject: [PATCH 16/18] try 3.10 --- .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 852554b0ffe..b8eb3dd5d33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.9 + - image: cimg/python:3.10 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index e82c7ec0356..5659a1168ae 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.9 + - image: cimg/python:3.10 resource_class: xlarge steps: - checkout From 3d2151a7756215c3e78fc222072789b8f2550880 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 20 Apr 2022 14:53:57 +0200 Subject: [PATCH 17/18] revert to 3.7 --- .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 b8eb3dd5d33..df93de4692e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.7 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 5659a1168ae..6f013979771 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.10 + - image: cimg/python:3.7 resource_class: xlarge steps: - checkout From 45459ea8f867181bab5d5664d1994a919d7dd19f Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Thu, 28 Apr 2022 09:20:56 +0200 Subject: [PATCH 18/18] try 3.8 once again --- .circleci/config.yml | 2 +- .circleci/config.yml.in | 2 +- test/test_prototype_builtin_datasets.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df93de4692e..88068f34768 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.8 resource_class: xlarge steps: - checkout diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 6f013979771..1ad6b9c9148 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -359,7 +359,7 @@ jobs: unittest_prototype: docker: - - image: cimg/python:3.7 + - image: cimg/python:3.8 resource_class: xlarge steps: - checkout diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index f731ba47774..528430afd1f 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -41,7 +41,7 @@ def test_coverage(): ) -@pytest.mark.filterwarnings("ignore::ResourceWarning") +# @pytest.mark.filterwarnings("ignore::ResourceWarning") @pytest.mark.filterwarnings("error") class TestCommon: @pytest.mark.parametrize("name", datasets.list_datasets())