properly version-gate xfailing test

Author: ilia-kats

src/anndata/_core/merge.py

@@ -122,7 +122,11 @@ def equal(a, b) -> bool:
     b = asarray(b)
     if a.ndim == b.ndim == 0:
         return bool(a == b)
-    return np.array_equal(a, b)
+    a_na = (
+        pd.isna(a) if a.dtype.names is None else np.False_
+    )  # pd.isna doesn't work for record arrays
+    b_na = pd.isna(b) if b.dtype.names is None else np.False_
+    return np.array_equal(a_na, b_na) and np.array_equal(a[~a_na], b[~b_na])
 
 
 @equal.register(pd.DataFrame)

tests/test_concatenate.py

@@ -12,6 +12,7 @@
 import pandas as pd
 import pytest
 import scipy
+import xarray as xr
 from boltons.iterutils import default_exit, remap, research
 from numpy import ma
 from packaging.version import Version
@@ -146,6 +147,14 @@ def fix_known_differences(
     orig = orig.copy()
     result = result.copy()
 
+    if backwards_compat:
+        del orig.varm
+        del orig.varp
+        if isinstance(result.obs, XDataset):
+            result.obs = result.obs.drop_vars(["batch"])
+        else:
+            result.obs.drop(columns=["batch"], inplace=True)
+
     for attrname in ("obs", "var"):
         if isinstance(getattr(result, attrname), XDataset):
             for adata in (orig, result):
@@ -171,11 +180,6 @@ def fix_known_differences(
     # * merge obsp, but some information should be lost
     del orig.obsp  # TODO
 
-    if backwards_compat:
-        del orig.varm
-        del orig.varp
-        result.obs.drop(columns=["batch"], inplace=True)
-
     # Possibly need to fix this, ordered categoricals lose orderedness
     for get_df in [lambda k: k.obs, lambda k: k.obsm["df"]]:
         str_to_df_converted = get_df(result)
@@ -234,9 +238,6 @@ def test_concatenate_roundtrip(
         **GEN_ADATA_DASK_ARGS,
     )
 
-    if backwards_compat and (obs_xdataset or var_xdataset):
-        pytest.xfail("https://github.com/pydata/xarray/issues/10218")
-
     remaining = adata.obs_names
     subsets = []
     while len(remaining) > 0:
@@ -246,6 +247,16 @@ def test_concatenate_roundtrip(
         remaining = remaining.difference(subset_idx)
 
     result = concat_func(subsets, join=join_type, uns_merge="same", index_unique=None)
+    if (
+        backwards_compat
+        and (obs_xdataset or var_xdataset)
+        and Version(xr.__version__) < Version("2025.4.0")
+    ):
+        pytest.xfail("https://github.com/pydata/xarray/issues/10218")
+    if backwards_compat and var_xdataset:
+        result.var = xr.Dataset.from_dataframe(
+            result.var
+        )  # backwards compat always returns a dataframe
 
     # Correcting for known differences
     orig, result = fix_known_differences(