From 75be6f4fde17368cc55a3e45a833d10e96b28262 Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Thu, 23 Mar 2023 00:32:46 -0300 Subject: [PATCH 1/3] fix: dependencies with constraints removed --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index da6b7c1..612722d 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ install_requires = [ 'imageio>=2.4.1,<2.5.0', 'reedsolo==0.3', - 'scipy>=1.1.0,<1.2.0', + 'scipy>=1.1.0', 'tqdm>=4.28.1', - 'numpy>=1.15.4<1.16.0', + 'numpy>=1.15.4', 'Pillow>=5.0.0,<8.0.0', 'torch>=1.0.0,<2.0.0', 'torchvision', From 6fab3d56d383614b35b8ddabd3a4241c87002005 Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Thu, 23 Mar 2023 00:33:01 -0300 Subject: [PATCH 2/3] fix: removed deprecated arg for isort --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3f64820..626ca8a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,6 @@ exclude = docs, .tox, .git, __pycache__, .ipynb_checkpoints ignore = # keep empty to prevent default ignores [isort] -include_trailing_comment = True line_length = 99 lines_between_types = 0 multi_line_output = 4 From 469fc9621fcb6107559bdf06210c6d2214d88ebe Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Thu, 23 Mar 2023 00:33:15 -0300 Subject: [PATCH 3/3] fix: updated tests based on changes of dependencies --- tests/test_models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_models.py b/tests/test_models.py index a3b3056..727b855 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -981,7 +981,9 @@ def test_decode_image_zero_candidates(self, mock_bits, mock_imread, mock_float_t steganogan.decoder.return_value.view.return_value.__gt__.return_value = _image - bits_image = _image.data.cpu.return_value.numpy.return_value.tolist.return_value + bits_image = ( + _image.data.int.return_value.cpu.return_value.numpy.return_value.tolist.return_value + ) mock_bytearray_to_text.return_value = None mock_os.return_value = True @@ -1029,7 +1031,9 @@ def test_decode_image(self, mock_bits, mock_imread, mock_float_tensor, steganogan.decoder.return_value.view.return_value.__gt__.return_value = _image - bits_image = _image.data.cpu.return_value.numpy.return_value.tolist.return_value + bits_image = ( + _image.data.int.return_value.cpu.return_value.numpy.return_value.tolist.return_value + ) mock_bits.return_value.split.return_value = [candidate] mock_bytearray_to_text.return_value = _candidate