Merge remote-tracking branch 'upstream/main' into ci/tests

Author: mroeschke

doc/source/user_guide/enhancingperf.rst

@@ -427,7 +427,7 @@ prefer that Numba throw an error if it cannot compile a function in a way that
 speeds up your code, pass Numba the argument
 ``nopython=True`` (e.g.  ``@jit(nopython=True)``). For more on
 troubleshooting Numba modes, see the `Numba troubleshooting page
-<https://numba.pydata.org/numba-doc/latest/user/troubleshoot.html#the-compiled-code-is-too-slow>`__.
+<https://numba.readthedocs.io/en/stable/user/troubleshoot.html>`__.
 
 Using ``parallel=True`` (e.g. ``@jit(parallel=True)``) may result in a ``SIGABRT`` if the threading layer leads to unsafe
 behavior. You can first `specify a safe threading layer <https://numba.readthedocs.io/en/stable/user/threading-layer.html#selecting-a-threading-layer-for-safe-parallel-execution>`__

pandas/core/dtypes/common.py

@@ -1836,6 +1836,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

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)