Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pandas 3 MultiIndex fixes #8847

Merged
merged 2 commits into from
Mar 20, 2024
Merged

pandas 3 MultiIndex fixes #8847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
267a17d
Fix dropping of muiltiindexes
dcherian Mar 16, 2024
90117b7
More fixes
dcherian Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion xarray/core/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5867,7 +5867,7 @@ def drop_vars(
for var in names_set:
maybe_midx = self._indexes.get(var, None)
if isinstance(maybe_midx, PandasMultiIndex):
idx_coord_names = set(maybe_midx.index.names + [maybe_midx.dim])
idx_coord_names = set(list(maybe_midx.index.names) + [maybe_midx.dim])
idx_other_names = idx_coord_names - set(names_set)
other_names.update(idx_other_names)
if other_names:
Expand Down
11 changes: 6 additions & 5 deletions xarray/tests/test_indexes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def test_constructor(self) -> None:
# default level names
pd_idx = pd.MultiIndex.from_arrays([foo_data, bar_data])
index = PandasMultiIndex(pd_idx, "x")
assert index.index.names == ("x_level_0", "x_level_1")
assert list(index.index.names) == ["x_level_0", "x_level_1"]

def test_from_variables(self) -> None:
v_level1 = xr.Variable(
Expand All @@ -370,7 +370,7 @@ def test_from_variables(self) -> None:
assert index.dim == "x"
assert index.index.equals(expected_idx)
assert index.index.name == "x"
assert index.index.names == ["level1", "level2"]
assert list(index.index.names) == ["level1", "level2"]

var = xr.Variable(("x", "y"), [[1, 2, 3], [4, 5, 6]])
with pytest.raises(
Expand Down Expand Up @@ -413,7 +413,8 @@ def test_stack(self) -> None:
index = PandasMultiIndex.stack(prod_vars, "z")

assert index.dim == "z"
assert index.index.names == ["x", "y"]
# TODO: change to tuple when pandas 3 is minimum
assert list(index.index.names) == ["x", "y"]
np.testing.assert_array_equal(
index.index.codes, [[0, 0, 0, 1, 1, 1], [0, 1, 2, 0, 1, 2]]
)
Expand Down Expand Up @@ -531,12 +532,12 @@ def test_rename(self) -> None:
assert new_index is index

new_index = index.rename({"two": "three"}, {})
assert new_index.index.names == ["one", "three"]
assert list(new_index.index.names) == ["one", "three"]
assert new_index.dim == "x"
assert new_index.level_coords_dtype == {"one": "<U1", "three": np.int32}

new_index = index.rename({}, {"x": "y"})
assert new_index.index.names == ["one", "two"]
assert list(new_index.index.names) == ["one", "two"]
assert new_index.dim == "y"
assert new_index.level_coords_dtype == level_coords_dtype

Expand Down