From d0e601978aefdeae4e07bc584ae590831795ad2a Mon Sep 17 00:00:00 2001 From: Oliver Mangold Date: Tue, 23 Apr 2024 09:29:38 +0200 Subject: [PATCH] fix failing cnn and hashing tests due to use of pytest.warns(None) no longer working reference: https://github.com/pytest-dev/pytest/issues/9404 --- tests/test_cnn.py | 4 +++- tests/test_hashing.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_cnn.py b/tests/test_cnn.py index 070ec35d..a074d5e6 100644 --- a/tests/test_cnn.py +++ b/tests/test_cnn.py @@ -8,6 +8,7 @@ import torch from PIL import Image import pytest +import warnings from torchvision.transforms import transforms from imagededup.methods.cnn import CNN @@ -891,7 +892,8 @@ def test_find_duplicates_encoding_integration(cnn): } encodings = cnn.encode_images(TEST_IMAGE_DIR_MIXED) - with pytest.warns(None): + with warnings.catch_warnings(): + warnings.simplefilter("ignore") duplicates = cnn.find_duplicates( encoding_map=encodings, min_similarity_threshold=0.9, scores=True, outfile=False ) diff --git a/tests/test_hashing.py b/tests/test_hashing.py index d7409ca6..3e38210a 100644 --- a/tests/test_hashing.py +++ b/tests/test_hashing.py @@ -5,6 +5,7 @@ from multiprocessing import cpu_count import pytest +import warnings import numpy as np from imagededup.methods.hashing import Hashing, PHash, DHash, AHash, WHash @@ -800,7 +801,8 @@ def test_find_duplicates_encoding_map_input(): 'ukbench09268.jpg': 'c73c36c2da2f29c9', } phasher = PHash() - with pytest.warns(None): + with warnings.catch_warnings(): + warnings.simplefilter("ignore") duplicate_dict = phasher.find_duplicates( encoding_map=encoding, max_distance_threshold=10 )