Skip to content

Commit f1f2354

Browse files
committed
Fixups
1 parent 91431e9 commit f1f2354

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

pandas/core/reshape/concat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ def new_axes(
673673
objs: list[Series | DataFrame],
674674
bm_axis: AxisInt,
675675
intersect: bool,
676-
sort: bool,
676+
sort: bool | lib.NoDefault,
677677
keys: Iterable[Hashable] | None,
678678
names: list[HashableT] | None,
679679
axis: AxisInt,

pandas/tests/io/pytables/test_select.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from pandas._libs.tslibs import Timestamp
55
from pandas.compat import PY312
6-
from pandas.errors import Pandas4Warning
76

87
import pandas as pd
98
from pandas import (
@@ -902,9 +901,7 @@ def test_select_as_multiple(setup_path):
902901
result = store.select_as_multiple(
903902
["df1", "df2"], where=["A>0", "B>0"], selector="df1"
904903
)
905-
msg = "Sorting by default when concatenating all DatetimeIndex is deprecated"
906-
with tm.assert_produces_warning(Pandas4Warning, match=msg):
907-
expected = concat([df1, df2], axis=1)
904+
expected = concat([df1, df2], axis=1)
908905
expected = expected[(expected.A > 0) & (expected.B > 0)]
909906
tm.assert_frame_equal(result, expected, check_freq=False)
910907
# FIXME: 2021-01-20 this is failing with freq None vs 4B on some builds
@@ -913,9 +910,7 @@ def test_select_as_multiple(setup_path):
913910
result = store.select_as_multiple(
914911
["df1", "df2"], where="index>df2.index[4]", selector="df2"
915912
)
916-
msg = "Sorting by default when concatenating all DatetimeIndex is deprecated"
917-
with tm.assert_produces_warning(Pandas4Warning, match=msg):
918-
expected = concat([df1, df2], axis=1)
913+
expected = concat([df1, df2], axis=1)
919914
expected = expected[5:]
920915
tm.assert_frame_equal(result, expected)
921916

0 commit comments

Comments
 (0)