Merge pull request #101 from mikapfl/new-xarray-compat

Replace hacks that worked on old versions of xarray with proper xarray calls

Author: mikapfl

changelog_unreleased/new-xarray-compat.rst

@@ -0,0 +1,3 @@
+* The latest (not-yet-released) version of xarray contains a rework of indexing
+  and some small changes to our I/O functions are necessary to support both old
+  and new xarray.

primap2/_setters.py

@@ -276,7 +276,7 @@ def set(
             # to broadcast value only to sel, but would need more careful handling
             # later.
             if new == "extend":
-                value, expanded = xr.broadcast(value, self._da)
+                expanded, value = xr.broadcast(self._da, value)
             else:
                 expanded = self._da
                 value = value.broadcast_like(expanded)

primap2/pm2io/_interchange_format.py

@@ -340,9 +340,12 @@ def from_interchange_format(
     for entity, dims in dimensions.items():
         da_entity = da.loc[{entity_col: entity}]
         # we still have a full MultiIndex, so trim it to the relevant dimensions
-        da_entity["index"] = da_entity.indexes["index"].droplevel(
-            list(index_cols - set(dims))
-        )
+        da_entity = da_entity.reset_index(list(index_cols - set(dims)), drop=True)
+        # depending on the version of xarray, an atomic, 0-dimensional coord
+        # for the entity remains. we have to remove it to be able to combine the
+        # dataset afterwards.
+        if entity_col in da_entity.coords:
+            da_entity = da_entity.drop(entity_col)
         # now we can safely unstack the index
         data_vars[entity] = da_entity.unstack("index").astype(dtypes[entity])