From f501fd63e484f7261b8831bf82c20457426cedc1 Mon Sep 17 00:00:00 2001
From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:25:03 -0800
Subject: [PATCH] Backport PR #60875: TST/CI: Address enforced numpy
 DeprecationWarning in test_pandas_dtype_numpy_warning

---
 pandas/core/dtypes/common.py       |  2 ++
 pandas/tests/dtypes/test_common.py | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pandas/core/dtypes/common.py b/pandas/core/dtypes/common.py
index fe705daaad5fa..873fb7676ed12 100644
--- a/pandas/core/dtypes/common.py
+++ b/pandas/core/dtypes/common.py
@@ -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
diff --git a/pandas/tests/dtypes/test_common.py b/pandas/tests/dtypes/test_common.py
index ceebfb1920594..8f87878b439f9 100644
--- a/pandas/tests/dtypes/test_common.py
+++ b/pandas/tests/dtypes/test_common.py
@@ -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
@@ -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)