blosc2.concatenate() -> blosc2.concat() (former name has been removed)

Author: FrancescAlted

caterva2/client.py

@@ -528,7 +528,7 @@ def copy(self, dst):
         """
         return self.client.copy(self.path, dst)
 
-    def concatenate(self, srcs, dst, axis):
+    def concat(self, srcs, dst, axis):
         """
         Concatenate the file with srcs along axis to a new location dst.
 
@@ -558,11 +558,11 @@ def concatenate(self, srcs, dst, axis):
         >>> root.upload('root-example/dir2/ds-4d.b2nd', "b.b2nd")
         <Dataset: @personal/b.b2nd>
         >>> file = root['a.b2nd']
-        >>> file.concatenate('@personal/b.b2nd', '@personal/c.b2nd', axis=0)
+        >>> file.concat('@personal/b.b2nd', '@personal/c.b2nd', axis=0)
         PurePosixPath('@personal/c.b2nd')
         """
         srcs = [srcs] if not isinstance(srcs, list) else srcs  # assure that srcs is list
-        return self.client.concatenate([self.path] + srcs, dst, axis)
+        return self.client.concat([self.path] + srcs, dst, axis)
 
     def stack(self, srcs, dst, axis):
         """
@@ -1347,7 +1347,7 @@ def copy(self, src, dst):
         )
         return pathlib.PurePosixPath(result)
 
-    def concatenate(self, srcs, dst, axis):
+    def concat(self, srcs, dst, axis):
         """
         Concatenate the srcs along axis to a new location dst.
 
@@ -1376,7 +1376,7 @@ def concatenate(self, srcs, dst, axis):
         <Dataset: @personal/a.b2nd>
         >>> root.upload('root-example/dir2/ds-4d.b2nd', "b.b2nd")
         <Dataset: @personal/b.b2nd>
-        >>> client.concatenate(['@personal/a.b2nd', '@personal/b.b2nd'], '@personal/c.b2nd', axis=0)
+        >>> client.concat(['@personal/a.b2nd', '@personal/b.b2nd'], '@personal/c.b2nd', axis=0)
         PurePosixPath('@personal/c.b2nd')
         """
         urlbase, _ = _format_paths(self.urlbase)

caterva2/services/server.py

@@ -881,7 +881,7 @@ async def concat(
     """
     abspaths, dest_abspath, destpath = concatstackhelper(payload, user)
     list_of_arrays = [blosc2.open(path) for path in abspaths]
-    blosc2.concatenate(list_of_arrays, payload.axis, urlpath=str(dest_abspath), mode="w")
+    blosc2.concat(list_of_arrays, payload.axis, urlpath=str(dest_abspath), mode="w")
     return str(destpath)
 
 

caterva2/tests/test_api.py

@@ -222,22 +222,20 @@ def test_concat(auth_client, fill_auth, examples_dir):
     # Test for File class
     file = myshared[copyname]
     resultname = "result.b2nd"
-    finalpath = file.concatenate([newpath2, newpath3], f"{myshared.name}/{resultname}", axis=0)
+    finalpath = file.concat([newpath2, newpath3], f"{myshared.name}/{resultname}", axis=0)
 
     assert myshared[resultname].shape[0] == 3 * myshared[copyname].shape[0]
 
     # Check the data
     fname = examples_dir / "ds-1d.b2nd"
     a = blosc2.open(fname)
-    locres = np.concatenate([a[:], a[:], a[:]], axis=0)
+    locres = np.concat([a[:], a[:], a[:]], axis=0)
     sfile = myshared[resultname]
     np.testing.assert_array_equal(sfile[:], locres)
 
     # Test for Client class
     resultname = "result2.b2nd"
-    finalpath = auth_client.concatenate(
-        [newpath, newpath2, newpath3], f"{myshared.name}/{resultname}", axis=0
-    )
+    finalpath = auth_client.concat([newpath, newpath2, newpath3], f"{myshared.name}/{resultname}", axis=0)
 
     assert myshared[resultname].shape[0] == 3 * myshared[copyname].shape[0]
 
@@ -321,7 +319,7 @@ def test_append(auth_client, fields, fill_auth, examples_dir):
     # Check the data
     fname = examples_dir / fname
     a = blosc2.open(fname)
-    b = np.concatenate([a[:], data])
+    b = np.concat([a[:], data])
     return np.testing.assert_array_equal(sfile[:], b)