Skip to content

Commit fda6056

Browse files
max-sixtyshoyer
authored andcommitted
Pandas labels deprecation (pydata#3016)
* Pandas deprecation * allow for older versions of pandas * update docs
1 parent f3efb5b commit fda6056

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

xarray/core/dataarray.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ def stack(self, dimensions=None, **dimensions_kwargs):
13511351
>>> stacked = arr.stack(z=('x', 'y'))
13521352
>>> stacked.indexes['z']
13531353
MultiIndex(levels=[['a', 'b'], [0, 1, 2]],
1354-
labels=[[0, 0, 0, 1, 1, 1], [0, 1, 2, 0, 1, 2]],
1354+
codes=[[0, 0, 0, 1, 1, 1], [0, 1, 2, 0, 1, 2]],
13551355
names=['x', 'y'])
13561356
13571357
See also
@@ -1394,7 +1394,7 @@ def unstack(self, dim=None):
13941394
>>> stacked = arr.stack(z=('x', 'y'))
13951395
>>> stacked.indexes['z']
13961396
MultiIndex(levels=[['a', 'b'], [0, 1, 2]],
1397-
labels=[[0, 0, 0, 1, 1, 1], [0, 1, 2, 0, 1, 2]],
1397+
codes=[[0, 0, 0, 1, 1, 1], [0, 1, 2, 0, 1, 2]],
13981398
names=['x', 'y'])
13991399
>>> roundtripped = stacked.unstack()
14001400
>>> arr.identical(roundtripped)

xarray/core/pdcompat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ def remove_unused_levels(self):
5757
--------
5858
>>> i = pd.MultiIndex.from_product([range(2), list('ab')])
5959
MultiIndex(levels=[[0, 1], ['a', 'b']],
60-
labels=[[0, 0, 1, 1], [0, 1, 0, 1]])
60+
codes=[[0, 0, 1, 1], [0, 1, 0, 1]])
6161
>>> i[2:]
6262
MultiIndex(levels=[[0, 1], ['a', 'b']],
63-
labels=[[1, 1], [0, 1]])
63+
codes=[[1, 1], [0, 1]])
6464
The 0 from the first level is not represented
6565
and can be removed
6666
>>> i[2:].remove_unused_levels()
6767
MultiIndex(levels=[[1], ['a', 'b']],
68-
labels=[[0, 0], [0, 1]])
68+
codes=[[0, 0], [0, 1]])
6969
"""
7070
import pandas.core.algorithms as algos
7171

xarray/tests/test_dataarray.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,8 +1762,12 @@ def test_stack_unstack(self):
17621762

17631763
# test GH3000
17641764
a = orig[:0, :1].stack(dim=('x', 'y')).dim.to_index()
1765-
b = pd.MultiIndex(levels=[pd.Int64Index([]), pd.Int64Index([0])],
1766-
labels=[[], []], names=['x', 'y'])
1765+
if pd.__version__ < '0.24.0':
1766+
b = pd.MultiIndex(levels=[pd.Int64Index([]), pd.Int64Index([0])],
1767+
labels=[[], []], names=['x', 'y'])
1768+
else:
1769+
b = pd.MultiIndex(levels=[pd.Int64Index([]), pd.Int64Index([0])],
1770+
codes=[[], []], names=['x', 'y'])
17671771
pd.util.testing.assert_index_equal(a, b)
17681772

17691773
actual = orig.stack(z=['x', 'y']).unstack('z').drop(['x', 'y'])

0 commit comments

Comments
 (0)