Skip to content

Commit 63f6d46

Browse files
committed
Fix more tests
1 parent ceb609d commit 63f6d46

22 files changed

+43
-55
lines changed

pandas/core/groupby/groupby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5694,7 +5694,7 @@ def _insert_quantile_level(idx: Index, qs: npt.NDArray[np.float64]) -> MultiInde
56945694
idx = cast(MultiIndex, idx)
56955695
levels = list(idx.levels) + [lev]
56965696
codes = [np.repeat(x, nqs) for x in idx.codes] + [np.tile(lev_codes, len(idx))]
5697-
mi = MultiIndex(levels=levels, codes=codes, names=idx.names + [None])
5697+
mi = MultiIndex(levels=levels, codes=codes, names=list(idx.names) + [None])
56985698
else:
56995699
nidx = len(idx)
57005700
idx_codes = coerce_indexer_dtype(np.arange(nidx), idx)

pandas/core/reshape/melt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def melt(
132132
else:
133133
mdata[col] = np.tile(id_data._values, K)
134134

135-
mcolumns = id_vars + var_name + [value_name]
135+
mcolumns = id_vars + list(var_name) + [value_name]
136136

137137
if frame.shape[1] > 0:
138138
mdata[value_name] = concat(

pandas/core/reshape/pivot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def _all_key(key):
395395
if isinstance(piece.index, MultiIndex):
396396
# We are adding an empty level
397397
transformed_piece.index = MultiIndex.from_tuples(
398-
[all_key], names=piece.index.names + [None]
398+
[all_key], names=list(piece.index.names) + [None]
399399
)
400400
else:
401401
transformed_piece.index = Index([all_key], name=piece.index.name)

pandas/core/strings/accessor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3507,7 +3507,7 @@ def str_extractall(arr, pat, flags: int = 0) -> DataFrame:
35073507

35083508
from pandas import MultiIndex
35093509

3510-
index = MultiIndex.from_tuples(index_list, names=arr.index.names + ["match"])
3510+
index = MultiIndex.from_tuples(index_list, names=list(arr.index.names) + ["match"])
35113511
dtype = _result_dtype(arr)
35123512

35133513
result = arr._constructor_expanddim(

pandas/tests/frame/methods/test_rename_axis.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ def test_rename_axis_mapper(self):
6060

6161
# Test for renaming index using dict
6262
result = df.rename_axis(index={"ll": "foo"})
63-
assert result.index.names == ["foo", "nn"]
63+
assert result.index.names == ("foo", "nn")
6464

6565
# Test for renaming index using a function
6666
result = df.rename_axis(index=str.upper, axis=0)
67-
assert result.index.names == ["LL", "NN"]
67+
assert result.index.names == ("LL", "NN")
6868

6969
# Test for renaming index providing complete list
7070
result = df.rename_axis(index=["foo", "goo"])
71-
assert result.index.names == ["foo", "goo"]
71+
assert result.index.names == ("foo", "goo")
7272

7373
# Test for changing index and columns at same time
7474
sdf = df.reset_index().set_index("nn").drop(columns=["ll", "y"])

pandas/tests/frame/methods/test_set_index.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def test_set_index_names(self):
130130
df = tm.makeDataFrame()
131131
df.index.name = "name"
132132

133-
assert df.set_index(df.index).index.names == ["name"]
133+
assert df.set_index(df.index).index.names == ("name",)
134134

135135
mi = MultiIndex.from_arrays(df[["A", "B"]].T.values, names=["A", "B"])
136136
mi2 = MultiIndex.from_arrays(
@@ -139,7 +139,7 @@ def test_set_index_names(self):
139139

140140
df = df.set_index(["A", "B"])
141141

142-
assert df.set_index(df.index).index.names == ["A", "B"]
142+
assert df.set_index(df.index).index.names == ("A", "B")
143143

144144
# Check that set_index isn't converting a MultiIndex into an Index
145145
assert isinstance(df.set_index(df.index).index, MultiIndex)
@@ -259,7 +259,7 @@ def test_set_index_pass_single_array(
259259
# only valid column keys are dropped
260260
# since B is always passed as array above, nothing is dropped
261261
expected = df.set_index(["B"], drop=False, append=append)
262-
expected.index.names = [index_name] + name if append else name
262+
expected.index.names = [index_name] + list(name) if append else name
263263

264264
tm.assert_frame_equal(result, expected)
265265

@@ -432,12 +432,12 @@ def test_set_index_datetime(self):
432432
df = df.set_index("label", append=True)
433433
tm.assert_index_equal(df.index.levels[0], expected)
434434
tm.assert_index_equal(df.index.levels[1], Index(["a", "b"], name="label"))
435-
assert df.index.names == ["datetime", "label"]
435+
assert df.index.names == ("datetime", "label")
436436

437437
df = df.swaplevel(0, 1)
438438
tm.assert_index_equal(df.index.levels[0], Index(["a", "b"], name="label"))
439439
tm.assert_index_equal(df.index.levels[1], expected)
440-
assert df.index.names == ["label", "datetime"]
440+
assert df.index.names == ("label", "datetime")
441441

442442
df = DataFrame(np.random.default_rng(2).random(6))
443443
idx1 = DatetimeIndex(

pandas/tests/frame/methods/test_sort_values.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ def test_sort_index_level_and_column_label(
874874
)
875875

876876
# Get index levels from df_idx
877-
levels = df_idx.index.names
877+
levels = list(df_idx.index.names)
878878

879879
# Compute expected by sorting on columns and the setting index
880880
expected = df_none.sort_values(
@@ -892,7 +892,7 @@ def test_sort_column_level_and_index_label(
892892
# GH#14353
893893

894894
# Get levels from df_idx
895-
levels = df_idx.index.names
895+
levels = list(df_idx.index.names)
896896

897897
# Compute expected by sorting on axis=0, setting index levels, and then
898898
# transposing. For some cases this will result in a frame with

pandas/tests/frame/test_stack_unstack.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ def test_unstack_multi_level_cols(self):
783783
[[10, 20, 30], [10, 20, 40]], names=["i1", "i2", "i3"]
784784
),
785785
)
786-
assert df.unstack(["i2", "i1"]).columns.names[-2:] == ["i2", "i1"]
786+
assert df.unstack(["i2", "i1"]).columns.names[-2:] == ("i2", "i1")
787787

788788
def test_unstack_multi_level_rows_and_cols(self):
789789
# PH 28306: Unstack df with multi level cols and rows
@@ -1780,7 +1780,7 @@ def test_stack_unstack_preserve_names(
17801780

17811781
unstacked = frame.unstack()
17821782
assert unstacked.index.name == "first"
1783-
assert unstacked.columns.names == ["exp", "second"]
1783+
assert unstacked.columns.names == ("exp", "second")
17841784

17851785
restacked = unstacked.stack(future_stack=future_stack)
17861786
assert restacked.index.names == frame.index.names

pandas/tests/generic/test_frame.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ def test_set_axis_name_mi(self, func):
3838
level_names = ["L1", "L2"]
3939

4040
result = methodcaller(func, level_names)(df)
41-
assert result.index.names == level_names
42-
assert result.columns.names == [None, None]
41+
assert result.index.names == tuple(level_names)
42+
assert result.columns.names == (None, None)
4343

4444
result = methodcaller(func, level_names, axis=1)(df)
45-
assert result.columns.names == ["L1", "L2"]
46-
assert result.index.names == [None, None]
45+
assert result.columns.names == ("L1", "L2")
46+
assert result.index.names == (None, None)
4747

4848
def test_nonzero_single_element(self):
4949
# allow single item via bool method

pandas/tests/generic/test_series.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def test_set_axis_name_mi(self, func):
2424

2525
result = methodcaller(func, ["L1", "L2"])(ser)
2626
assert ser.index.name is None
27-
assert ser.index.names == ["l1", "l2"]
27+
assert ser.index.names == ("l1", "l2")
2828
assert result.index.name is None
29-
assert result.index.names, ["L1", "L2"]
29+
assert result.index.names, ("L1", "L2")
3030

3131
def test_set_axis_name_raises(self):
3232
ser = Series([1])

0 commit comments

Comments
 (0)