img aug version bumped (#658)

* img aug version bumped

* fix

* fix in tests

* version bump to 0.4.6

* imguag requirment is now >=0.4.0

albumentations/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-__version__ = "0.4.5"
+__version__ = "0.4.6"
 
 from .core.composition import *
 from .core.transforms_interface import *

setup.py

@@ -5,7 +5,7 @@
 from pkg_resources import DistributionNotFound, get_distribution
 
 
-INSTALL_REQUIRES = ["numpy>=1.11.1", "scipy", "imgaug>=0.2.5,<0.2.7", "PyYAML"]
+INSTALL_REQUIRES = ["numpy>=1.11.1", "scipy", "imgaug>=0.4.0", "PyYAML"]
 
 # If first not installed install second package
 CHOOSE_INSTALL_REQUIRES = [("opencv-python>=4.1.1", "opencv-python-headless>=4.1.1")]

tests/test_imgaug.py

@@ -1,11 +1,11 @@
 import numpy as np
 import pytest
 
-from albumentations.imgaug.transforms import IAAPiecewiseAffine, IAAPerspective, IAAFliplr, IAAFlipud
 from albumentations.augmentations.bbox_utils import (
     convert_bboxes_from_albumentations,
     convert_bboxes_to_albumentations,
 )
+from albumentations.imgaug.transforms import IAAPiecewiseAffine, IAAPerspective, IAAFliplr, IAAFlipud
 
 
 @pytest.mark.parametrize("augmentation_cls", [IAAPiecewiseAffine, IAAPerspective, IAAFliplr])
@@ -21,7 +21,7 @@ def test_imagaug_fliplr_transform_bboxes(image):
     aug = IAAFliplr(p=1)
     mask = np.copy(image)
     bboxes = [(10, 10, 20, 20), (20, 10, 30, 40)]
-    expect = [(79, 10, 89, 20), (69, 10, 79, 40)]
+    expect = [(80, 10, 90, 20), (70, 10, 80, 40)]
     bboxes = convert_bboxes_to_albumentations(bboxes, "pascal_voc", rows=image.shape[0], cols=image.shape[1])
     data = aug(image=image, mask=mask, bboxes=bboxes)
     actual = convert_bboxes_from_albumentations(data["bboxes"], "pascal_voc", rows=image.shape[0], cols=image.shape[1])
@@ -34,7 +34,7 @@ def test_imagaug_flipud_transform_bboxes(image):
     mask = np.copy(image)
     dummy_class = 1234
     bboxes = [(10, 10, 20, 20, dummy_class), (20, 10, 30, 40, dummy_class)]
-    expect = [(10, 79, 20, 89, dummy_class), (20, 59, 30, 89, dummy_class)]
+    expect = [(10, 80, 20, 90, dummy_class), (20, 60, 30, 90, dummy_class)]
     bboxes = convert_bboxes_to_albumentations(bboxes, "pascal_voc", rows=image.shape[0], cols=image.shape[1])
     data = aug(image=image, mask=mask, bboxes=bboxes)
     actual = convert_bboxes_from_albumentations(data["bboxes"], "pascal_voc", rows=image.shape[0], cols=image.shape[1])

tests/test_keypoint.py

@@ -2,19 +2,19 @@
 
 import numpy as np
 import pytest
-from albumentations import HorizontalFlip, VerticalFlip, IAAFliplr, IAAFlipud, CenterCrop
 
+import albumentations.augmentations.functional as F
+from albumentations import HorizontalFlip, VerticalFlip, IAAFliplr, IAAFlipud, CenterCrop
 from albumentations.augmentations.keypoints_utils import (
     convert_keypoint_from_albumentations,
     convert_keypoints_from_albumentations,
     convert_keypoint_to_albumentations,
     convert_keypoints_to_albumentations,
     angle_to_2pi_range,
 )
+from albumentations.augmentations.transforms import RandomSizedCrop, RandomResizedCrop
 from albumentations.core.composition import Compose
 from albumentations.core.transforms_interface import NoOp
-from albumentations.augmentations.transforms import RandomSizedCrop, RandomResizedCrop
-import albumentations.augmentations.functional as F
 
 
 @pytest.mark.parametrize(
@@ -222,13 +222,13 @@ def test_keypoint_transform_format_xyas(aug, keypoints, expected):
 @pytest.mark.parametrize(
     ["aug", "keypoints", "expected"],
     [
-        [IAAFliplr, [(20, 30, 0, 0)], [(79, 30, 0, 0)]],
-        [IAAFliplr, [(20, 30, 45, 0)], [(79, 30, 45, 0)]],
-        [IAAFliplr, [(20, 30, 90, 0)], [(79, 30, 90, 0)]],
+        [IAAFliplr, [(20, 30, 0, 0)], [(80, 30, 0, 0)]],
+        [IAAFliplr, [(20, 30, 45, 0)], [(80, 30, 45, 0)]],
+        [IAAFliplr, [(20, 30, 90, 0)], [(80, 30, 90, 0)]],
         #
-        [IAAFlipud, [(20, 30, 0, 0)], [(20, 69, 0, 0)]],
-        [IAAFlipud, [(20, 30, 45, 0)], [(20, 69, 45, 0)]],
-        [IAAFlipud, [(20, 30, 90, 0)], [(20, 69, 90, 0)]],
+        [IAAFlipud, [(20, 30, 0, 0)], [(20, 70, 0, 0)]],
+        [IAAFlipud, [(20, 30, 45, 0)], [(20, 70, 45, 0)]],
+        [IAAFlipud, [(20, 30, 90, 0)], [(20, 70, 90, 0)]],
     ],
 )
 def test_keypoint_transform_format_xy(aug, keypoints, expected):