Skip to content

Commit

Permalink
Backport PR #60875 on branch 2.3.x (TST/CI: Address enforced numpy De…
Browse files Browse the repository at this point in the history
…precationWarning in test_pandas_dtype_numpy_warning) (#60878)

Backport PR #60875: TST/CI: Address enforced numpy DeprecationWarning in test_pandas_dtype_numpy_warning

Co-authored-by: Matthew Roeschke <[email protected]>
  • Loading branch information
meeseeksmachine and mroeschke authored Feb 7, 2025
1 parent e3df72a commit e276e89
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
2 changes: 2 additions & 0 deletions pandas/core/dtypes/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1654,6 +1654,8 @@ def pandas_dtype(dtype) -> DtypeObj:
# raise a consistent TypeError if failed
try:
with warnings.catch_warnings():
# TODO: warnings.catch_warnings can be removed when numpy>2.2.2
# is the minimum version
# GH#51523 - Series.astype(np.integer) doesn't show
# numpy deprecation warning of np.integer
# Hence enabling DeprecationWarning
Expand Down
18 changes: 13 additions & 5 deletions pandas/tests/dtypes/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import pandas._testing as tm
from pandas.api.types import pandas_dtype
from pandas.arrays import SparseArray
from pandas.util.version import Version


# EA & Actual Dtypes
Expand Down Expand Up @@ -788,11 +789,18 @@ def test_validate_allhashable():

def test_pandas_dtype_numpy_warning():
# GH#51523
with tm.assert_produces_warning(
DeprecationWarning,
check_stacklevel=False,
match="Converting `np.integer` or `np.signedinteger` to a dtype is deprecated",
):
if Version(np.__version__) <= Version("2.2.2"):
ctx = tm.assert_produces_warning(
DeprecationWarning,
check_stacklevel=False,
match=(
"Converting `np.integer` or `np.signedinteger` to a dtype is deprecated"
),
)
else:
ctx = tm.external_error_raised(TypeError)

with ctx:
pandas_dtype(np.integer)


Expand Down

0 comments on commit e276e89

Please sign in to comment.