Skip to content

Commit 2d44a36

Browse files
committed
Merge branch '2.3.x' of https://github.com/pandas-dev/pandas into 2.3.x
2 parents 413563e + 12cd45e commit 2d44a36

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pandas/core/dtypes/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ def pandas_dtype(dtype) -> DtypeObj:
16541654
# raise a consistent TypeError if failed
16551655
try:
16561656
with warnings.catch_warnings():
1657-
# TODO: warnings.catch_warnings can be removed when numpy>2.2.2
1657+
# TODO: warnings.catch_warnings can be removed when numpy>2.3.0
16581658
# is the minimum version
16591659
# GH#51523 - Series.astype(np.integer) doesn't show
16601660
# numpy deprecation warning of np.integer

pandas/core/groupby/grouper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def is_in_obj(gpr) -> bool:
10231023
return False
10241024

10251025
for gpr, level in zip(keys, levels):
1026-
if is_in_obj(gpr): # df.groupby(df['name'])
1026+
if isinstance(obj, DataFrame) and is_in_obj(gpr): # df.groupby(df['name'])
10271027
in_axis = True
10281028
exclusions.add(gpr.name)
10291029

pandas/tests/dtypes/test_common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ def test_validate_allhashable():
789789

790790
def test_pandas_dtype_numpy_warning():
791791
# GH#51523
792-
if Version(np.__version__) <= Version("2.2.2"):
792+
if Version(np.__version__) < Version("2.3.0.dev0"):
793793
ctx = tm.assert_produces_warning(
794794
DeprecationWarning,
795795
check_stacklevel=False,

0 commit comments

Comments
 (0)