Merge pull request #263 from Oxid15/develop

v0.14.2

Author: Oxid15

cascade/base/meta_handler.py

@@ -32,6 +32,12 @@
 default_meta_format = ".json"
 supported_meta_formats = (".json", ".yml", ".yaml")
 
+# This is for python 3.7
+# where latest deepdiff is 6.7.1
+if hasattr(deepdiff.diff, "PrettyOrderedSet"):
+    diff_set = getattr(deepdiff.diff, "PrettyOrderedSet")
+else:
+    diff_set = deepdiff.diff.SetOrdered
 
 class CustomEncoder(JSONEncoder):
     def default(self, obj: Any) -> Any:
@@ -62,10 +68,10 @@ def default(self, obj: Any) -> Any:
         ):
             return int(obj)
 
-        elif isinstance(obj, (np.float_, np.float16, np.float32, np.float64)):  # type: ignore
+        elif isinstance(obj, (np.float16, np.float32, np.float64)):  # type: ignore
             return float(obj)
 
-        elif isinstance(obj, (np.complex_, np.complex64, np.complex128)):  # type: ignore
+        elif isinstance(obj, (np.complex64, np.complex128)):  # type: ignore
             return {"real": obj.real, "imag": obj.imag}
 
         elif isinstance(obj, (np.ndarray,)):
@@ -77,7 +83,7 @@ def default(self, obj: Any) -> Any:
         elif isinstance(obj, np.void):
             return None
 
-        elif isinstance(obj, deepdiff.diff.PrettyOrderedSet):
+        elif isinstance(obj, diff_set):
             return list(obj)
 
         elif isinstance(obj, deepdiff.DeepDiff):

cascade/data/apply_modifier.py

@@ -68,12 +68,14 @@ def __init__(
             random.seed(seed)
 
     def __getitem__(self, index: int) -> Any:
+        item = self._dataset[index]
         if self._p is not None:
             rnd = random.random()
             if rnd > self._p:
-                return super().__getitem__(index)
-
-            item = self._dataset[index]
+                return item
+            else:
+                return self._func(item)
+        else:
             return self._func(item)
 
     def __iter__(self) -> Iterator[T]:

cascade/tests/data/test_apply_modifier.py

@@ -37,6 +37,7 @@ def test_apply_modifier(arr, func):
     ds = Wrapper(arr)
     ds = ApplyModifier(ds, func)
     assert list(map(func, arr)) == [item for item in ds]
+    assert list(map(func, arr)) == [ds[i] for i in range(len(ds))]
 
 
 def test_ds_coverage(dataset):

cascade/version.py

@@ -16,6 +16,6 @@
 
 __ALL__ = ["__version__", "__author__", "__author_email__"]
 
-__version__ = "0.14.1"
+__version__ = "0.14.2"
 __author__ = "Ilia Moiseev"
 __author_email__ = "ilia.moiseev.5@yandex.ru"

requirements.txt

@@ -1,9 +1,9 @@
 tqdm>=4.64.1
-numpy>=1.18.5,<2
+numpy>=1.18.5
 pandas>=1.1.5
-deepdiff>=5.0.2
+deepdiff>=5.0.2,<9
 pendulum>=2.1.2
-flatten_json>=0.1.13
+flatten_json==0.1.13
 pyyaml>=5.4.1
 coolname>=2.0.0
 click>=8.0.0

setup.py

@@ -47,11 +47,11 @@
     python_requires=">=3.7",
     install_requires=[
         "tqdm>=4.64.1",
-        "numpy>=1.18.5,<2",
+        "numpy>=1.18.5",
         "pandas>=1.1.5",
-        "deepdiff>=5.0.2",
+        "deepdiff>=5.0.2,<9",
         "pendulum>=2.1.2",
-        "flatten_json>=0.1.13",
+        "flatten_json==0.1.13",
         "pyyaml>=5.4.1",
         "coolname>=2.0.0",
         "click>=8.0.0",