diff --git a/src/mudata/_core/to_.py b/src/mudata/_core/to_.py index 783afd1..5ede83c 100644 --- a/src/mudata/_core/to_.py +++ b/src/mudata/_core/to_.py @@ -31,7 +31,7 @@ def to_anndata(mdata: MuData, **kwargs) -> AnnData: df = getattr(adata, attr) if hasattr(df, "combine_first") and callable(df.combine_first): setattr(adata, attr, df.combine_first(getattr(mdata, attr))) - for attr in ["obs", "obsm", "obsp", "var", "varm", "varp", "uns"]: + for attr in ["obsm", "obsp", "varm", "varp", "uns"]: getattr(adata, attr).update(getattr(mdata, attr)) return adata diff --git a/tests/test_pull_push.py b/tests/test_pull_push.py index df93245..e5ae7f3 100644 --- a/tests/test_pull_push.py +++ b/tests/test_pull_push.py @@ -199,12 +199,12 @@ def test_push_var_simple(self, modalities): map = mdata.varmap[modname].ravel() mask = map > 0 - assert (mdata.var["pushed"][mask] == mod.var["pushed"][map[mask] - 1]).all() + assert (mdata.var["pushed"][mask] == mod.var["pushed"].iloc[map[mask] - 1]).all() assert "mod2_pushed" in mdata["mod2"].var.columns map = mdata.varmap["mod2"].ravel() mask = map > 0 - assert (mdata.var["mod2:mod2_pushed"][mask] == mdata["mod2"].var["mod2_pushed"][map[mask] - 1]).all() + assert (mdata.var["mod2:mod2_pushed"][mask] == mdata["mod2"].var["mod2_pushed"].iloc[map[mask] - 1]).all() @pytest.mark.parametrize("var_unique", [True, False]) @pytest.mark.parametrize("obs_n", ["joint", "disjoint"]) @@ -225,12 +225,12 @@ def test_push_obs_simple(self, modalities): map = mdata.obsmap[modname].ravel() mask = map > 0 - assert (mdata.obs["pushed"][mask] == mod.obs["pushed"][map[mask] - 1]).all() + assert (mdata.obs["pushed"][mask] == mod.obs["pushed"].iloc[map[mask] - 1]).all() assert "mod2_pushed" in mdata["mod2"].obs.columns map = mdata.obsmap["mod2"].ravel() mask = map > 0 - assert (mdata.obs["mod2:mod2_pushed"][mask] == mdata["mod2"].obs["mod2_pushed"][map[mask] - 1]).all() + assert (mdata.obs["mod2:mod2_pushed"][mask] == mdata["mod2"].obs["mod2_pushed"].iloc[map[mask] - 1]).all() @pytest.mark.usefixtures("filepath_h5mu")