Skip to content

Commit 824f960

Browse files
Fix adata layers None after anndata X unification (#1122)
1 parent ef757d1 commit 824f960

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

src/spatialdata/_core/validation.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ def check_all_keys_case_insensitively_unique(keys: Collection[str], location: tu
150150
exc_type=ValueError,
151151
) as collect_error:
152152
for key in keys:
153+
if key is None:
154+
continue
153155
normalized_key = key.lower()
154156
with collect_error(location=location + (key,)):
155157
check_key_is_case_insensitively_unique(key, seen)
@@ -247,6 +249,8 @@ def validate_table_attr_keys(data: AnnData, location: tuple[str, ...] = ()) -> N
247249
with collect_error(location=attr_path):
248250
check_all_keys_case_insensitively_unique(getattr(data, attr).keys(), location=attr_path)
249251
for key in getattr(data, attr):
252+
if key is None:
253+
continue
250254
key_path = attr_path + (key,)
251255
with collect_error(location=key_path):
252256
if attr in ("obs", "var"):

tests/io/test_multi_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_null_values_in_instance_key_column(self, full_sdata: SpatialData):
4747
n_obs = full_sdata["table"].n_obs
4848
full_sdata["table"].obs["instance_id"] = range(n_obs)
4949
# introduce null values
50-
full_sdata["table"].obs.loc[0, "instance_id"] = None
50+
full_sdata["table"].obs.at[full_sdata["table"].obs_names[0], "instance_id"] = None
5151
with pytest.raises(ValueError, match="must not contain null values, but it does."):
5252
full_sdata.validate_table_in_spatialdata(table=full_sdata["table"])
5353

0 commit comments

Comments
 (0)