adapt add_anndatas change to tests

Author: selmanozleyen

tests/conftest.py

@@ -114,7 +114,7 @@ def simple_collection(
 ) -> tuple[DatasetCollection, ad.AnnData]:
     zarr_stores = sorted(f for f in adata_with_zarr_path_same_var_space[1].iterdir() if f.is_dir())
     output_path = Path(tmpdir_factory.mktemp("zarr_folder")) / "simple_fixture.zarr"
-    collection = DatasetCollection(output_path).add_adatas(
+    collection = DatasetCollection(output_path).add_anndatas(
         zarr_stores,
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,

tests/test_preshuffle.py

@@ -51,7 +51,7 @@ def test_store_creation_warnings_with_different_keys(elem_name: Literal["obsm",
     adata_1.write_h5ad(path_1)
     adata_2.write_h5ad(path_2)
     with pytest.warns(UserWarning, match=rf"Found {elem_name} keys.* not present in all anndatas"):
-        DatasetCollection(tmp_path / "collection.zarr").add_adatas(
+        DatasetCollection(tmp_path / "collection.zarr").add_anndatas(
             [path_1, path_2],
             zarr_sparse_chunk_size=10,
             zarr_sparse_shard_size=20,
@@ -69,7 +69,7 @@ def test_store_creation_no_warnings_with_custom_load(tmp_path: Path):
     path_2 = tmp_path / "with_extra_key.h5ad"
     adata_1.write_h5ad(path_1)
     adata_2.write_h5ad(path_2)
-    collection = DatasetCollection(tmp_path / "collection.zarr").add_adatas(
+    collection = DatasetCollection(tmp_path / "collection.zarr").add_anndatas(
         [path_1, path_2],
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,
@@ -91,7 +91,7 @@ def test_store_creation_path_added_to_obs(tmp_path: Path):
     adata_2.write_h5ad(path_2)
     paths = [path_1, path_2]
     output_dir = tmp_path / "path_src_collection.zarr"
-    collection = DatasetCollection(output_dir).add_adatas(
+    collection = DatasetCollection(output_dir).add_anndatas(
         paths,
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,
@@ -120,7 +120,7 @@ def test_store_addition_different_keys(
     adata_orig.write_h5ad(orig_path)
     output_path = tmp_path / "zarr_store_addition_different_keys.zarr"
     collection = DatasetCollection(output_path)
-    collection.add_adatas(
+    collection.add_anndatas(
         [orig_path],
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,
@@ -136,7 +136,7 @@ def test_store_addition_different_keys(
     additional_path = tmp_path / "with_extra_key.h5ad"
     adata.write_h5ad(additional_path)
     with pytest.warns(UserWarning, match=rf"Found {elem_name} keys.* not present in all anndatas"):
-        collection.add_adatas(
+        collection.add_anndatas(
             [additional_path],
             load_adata=load_adata,
             zarr_sparse_chunk_size=10,
@@ -169,7 +169,7 @@ def test_store_creation_default(
         else r"Loading h5ad is currently not supported",
     ):
         kwargs = {} if is_zarr else {"is_collection_h5ad": True}
-        collection = DatasetCollection(output_path, **kwargs).add_adatas(
+        collection = DatasetCollection(output_path, **kwargs).add_anndatas(
             [adata_with_h5_path_different_var_space[1] / f for f in h5_files if str(f).endswith(".h5ad")]
         )
     assert isinstance(
@@ -201,7 +201,7 @@ def test_store_creation(
         adata_with_h5_path_different_var_space[1].parent
         / f"zarr_store_creation_test_{shuffle}_{'default_read' if load_adata is None else 'custom_read'}.zarr"
     )
-    collection = DatasetCollection(output_path).add_adatas(
+    collection = DatasetCollection(output_path).add_anndatas(
         [adata_with_h5_path_different_var_space[1] / f for f in h5_files if str(f).endswith(".h5ad")],
         var_subset=var_subset,
         zarr_sparse_chunk_size=10,
@@ -292,7 +292,7 @@ def test_mismatched_raw_concat(
     h5_files = sorted(adata_with_h5_path_different_var_space[1].iterdir())
     output_path = adata_with_h5_path_different_var_space[1].parent / "zarr_store_creation_test_heterogeneous.zarr"
     h5_paths = [adata_with_h5_path_different_var_space[1] / f for f in h5_files if str(f).endswith(".h5ad")]
-    collection = DatasetCollection(output_path).add_adatas(
+    collection = DatasetCollection(output_path).add_anndatas(
         h5_paths,
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,
@@ -337,7 +337,7 @@ def test_store_extension(
     additional = all_h5_paths[4:]  # don't add everything to get a "different" var space
     # create new store
     collection = DatasetCollection(store_path)
-    collection.add_adatas(
+    collection.add_anndatas(
         original,
         zarr_sparse_chunk_size=10,
         zarr_sparse_shard_size=20,
@@ -348,7 +348,7 @@ def test_store_extension(
         shuffle=True,
     )
     # add h5ads to existing store
-    collection.add_adatas(
+    collection.add_anndatas(
         additional,
         load_adata=load_adata,
         zarr_sparse_chunk_size=10,
@@ -379,5 +379,5 @@ def test_empty(tmp_path: Path):
     assert collection.is_empty
     # Doesn't matter what errors as long as this function runs, but not to completion
     with pytest.raises(TypeError):
-        collection.add_adatas()
+        collection.add_anndatas()
     assert not (V1_ENCODING.items() <= g.attrs.items())