update usage of scipy.misc.imresize

Author: mbucchi

pybalu/feature_extraction/fourier.py

@@ -1,8 +1,8 @@
 __all__ = ['fourier_features', 'FourierExtractor']
 
 import numpy as np
-from scipy.misc import imresize
 import itertools as it
+from PIL import Image
 
 from pybalu.base import FeatureExtractor
 
@@ -89,15 +89,13 @@ def fourier_features(image, region=None, *, vresize=64, hresize=64, vfreq=2, hfr
     if show:
         print('--- extracting Fourier features...')
 
-    img_resize = imresize(I, (vresize, hresize), interp='bicubic', mode='F')
+    img_resize = _imresize(I, (vresize, hresize))
     img_fourier = np.fft.fft2(img_resize)
     img_abs = np.abs(img_fourier)
     img_angle = np.angle(img_fourier)
 
-    F = imresize(img_abs[:v_half, :h_half],
-                 (vfreq, hfreq), interp='bicubic', mode='F')
-    A = imresize(img_angle[:v_half, :h_half],
-                 (vfreq, hfreq), interp='bicubic', mode='F')
+    F = _imresize(img_abs[:v_half, :h_half], (vfreq, hfreq))
+    A = _imresize(img_angle[:v_half, :h_half], (vfreq, hfreq))
 
     features = np.hstack([F.ravel(), A.ravel()]).astype(float)
     if labels:
@@ -110,6 +108,11 @@ def fourier_features(image, region=None, *, vresize=64, hresize=64, vfreq=2, hfr
     return features
 
 
+def _imresize(arr, size):
+    """Used to keep compatibility with deprecated scipy function `imresize`"""
+    return np.array(Image.fromarray(arr).resize(size))
+
+
 class FourierExtractor(FeatureExtractor):
     def __init__(self, *, vresize=64, hresize=64, vfreq=2, hfreq=2):
         self.vresize = vresize

pybalu/io/imread.py

@@ -18,7 +18,7 @@ def imread(filename, *, normalize=False, flatten=False):
     normalize: boolean, optional
         If set to true, the return value will be an array with float values between 0 and 1.
         If set to false, the reurn value will be an array with uint8 values between 0 and 255.
-        default value is True.
+        default value is False.
     flatten: boolean, optional
         If set to true, the return value is a 2 dimensional ndarray with the grayscale
         representation of the loaded image.

requirements.txt

@@ -2,6 +2,7 @@ cython>=0.29.6
 numpy>=1.16.1
 scipy>=1.1.0
 imageio>=2.5.0
+Pillow>=7.2.0
 scikit-image>=0.14.2
 scikit-learn>=0.20.2
 tqdm>=4.29.1

setup.py

@@ -356,17 +356,19 @@ def getext(filename): return os.path.splitext(filename)[1]
         "numpy>=1.16.1",
         "scipy>=1.1.0",
         "imageio>=2.5.0",
-        "scikit-image>=0.14.2",
-        "scikit-learn>=0.20.2",
+        "Pillow>=7.2.0",
+        "scikit-image>=0.17.2",
+        "scikit-learn>=0.22.2",
         "tqdm>=4.29.1"
     ],
     setup_requires=[
         "cython>=0.29.6",
         "numpy>=1.16.1",
         "scipy>=1.1.0",
         "imageio>=2.5.0",
-        "scikit-image>=0.14.2",
-        "scikit-learn>=0.20.2",
+        "Pillow>=7.2.0",
+        "scikit-image>=0.17.2",
+        "scikit-learn>=0.22.2",
         "tqdm>=4.29.1"
     ],
     python_requires='!=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4',