Merge branch 'main' into ig/zarr_compat

scverse · Jan 10, 2025 · 3a163f3 · 3a163f3
2 parents f73a184 + a8c62e8
commit 3a163f3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git a/src/testing/anndata/_helpers.py b/src/testing/anndata/_helpers.py
diff --git a/tests/test_layers.py b/tests/test_layers.py
@@ -10,7 +10,6 @@
 
 from anndata import AnnData, ImplicitModificationWarning, read_h5ad, read_loom
 from anndata.tests.helpers import gen_typed_df_t2_size
-from testing.anndata._helpers import xfail_if_numpy2_loompy
 
 X = np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
 L = np.array([[10, 11, 12], [13, 14, 15], [16, 17, 18]])
@@ -77,7 +76,6 @@ def test_readwrite(backing_h5ad):
     assert (adata.layers["L"] == adata_read.layers["L"]).all()
 
 
-@xfail_if_numpy2_loompy
 @pytest.mark.skipif(find_spec("loompy") is None, reason="loompy not installed")
 def test_readwrite_loom(tmp_path):
     loom_path = tmp_path / "test.loom"

diff --git a/tests/test_readwrite.py b/tests/test_readwrite.py
@@ -22,7 +22,6 @@
 from anndata._io.specs.registry import IORegistryError
 from anndata.compat import DaskArray, SpArray, _read_attr
 from anndata.tests.helpers import as_dense_dask_array, assert_equal, gen_adata
-from testing.anndata._helpers import xfail_if_numpy2_loompy
 
 if TYPE_CHECKING:
     from os import PathLike
@@ -380,7 +379,6 @@ def test_changed_obs_var_names(tmp_path, diskfmt):
         assert_equal(read, modified, exact=True)
 
 
-@xfail_if_numpy2_loompy
 @pytest.mark.skipif(not find_spec("loompy"), reason="Loompy is not installed")
 @pytest.mark.parametrize("typ", [np.array, csr_matrix])
 @pytest.mark.parametrize("obsm_mapping", [{}, dict(X_composed=["oanno3", "oanno4"])])
@@ -438,7 +436,6 @@ def test_readwrite_loom(typ, obsm_mapping, varm_mapping, tmp_path):
     assert adata.var_names.name == var_dim
 
 
-@xfail_if_numpy2_loompy
 @pytest.mark.skipif(not find_spec("loompy"), reason="Loompy is not installed")
 def test_readloom_deprecations(tmp_path):
     loom_pth = tmp_path / "test.loom"