Skip to content

Commit 1dda2c2

Browse files
committed
TST: Fix some test builds for numpy 2.0
1 parent ee05885 commit 1dda2c2

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

pandas/compat/numpy/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
np_version_gte1p24 = _nlv >= Version("1.24")
1313
np_version_gte1p24p3 = _nlv >= Version("1.24.3")
1414
np_version_gte1p25 = _nlv >= Version("1.25")
15-
np_version_gt2 = _nlv >= Version("2.0.0.dev0")
15+
np_version_gt2 = _nlv >= Version("2.0.0")
1616
is_numpy_dev = _nlv.dev is not None
1717
_min_numpy_ver = "1.23.5"
1818

pandas/core/dtypes/cast.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
is_supported_dtype,
4040
)
4141
from pandas._libs.tslibs.timedeltas import array_to_timedelta64
42-
from pandas.compat.numpy import np_version_gt2
4342
from pandas.errors import (
4443
IntCastingNaNError,
4544
LossySetitemError,
@@ -1643,13 +1642,11 @@ def maybe_cast_to_integer_array(arr: list | np.ndarray, dtype: np.dtype) -> np.n
16431642
with warnings.catch_warnings():
16441643
# We already disallow dtype=uint w/ negative numbers
16451644
# (test_constructor_coercion_signed_to_unsigned) so safe to ignore.
1646-
if not np_version_gt2:
1647-
warnings.filterwarnings(
1648-
"ignore",
1649-
"NumPy will stop allowing conversion of "
1650-
"out-of-bound Python int",
1651-
DeprecationWarning,
1652-
)
1645+
warnings.filterwarnings(
1646+
"ignore",
1647+
"NumPy will stop allowing conversion of " "out-of-bound Python int",
1648+
DeprecationWarning,
1649+
)
16531650
casted = np.asarray(arr, dtype=dtype)
16541651
else:
16551652
with warnings.catch_warnings():

pandas/tests/indexes/datetimelike_/test_indexing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@pytest.mark.parametrize("ldtype", dtlike_dtypes)
2020
@pytest.mark.parametrize("rdtype", dtlike_dtypes)
2121
def test_get_indexer_non_unique_wrong_dtype(ldtype, rdtype):
22-
vals = np.tile(3600 * 10**9 * np.arange(3), 2)
22+
vals = np.tile(3600 * 10**9 * np.arange(3, dtype=np.int64), 2)
2323

2424
def construct(dtype):
2525
if dtype is dtlike_dtypes[-1]:

pandas/tests/scalar/timedelta/test_arithmetic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ def test_td_mul_numeric_ndarray(self):
419419

420420
def test_td_mul_numeric_ndarray_0d(self):
421421
td = Timedelta("1 day")
422-
other = np.array(2)
422+
other = np.array(2, dtype=np.int64)
423423
assert other.ndim == 0
424424
expected = Timedelta("2 days")
425425

pandas/tests/tools/test_to_datetime.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3182,7 +3182,7 @@ def test_invalid_origin(self, unit):
31823182
)
31833183
def test_epoch(self, units, epochs):
31843184
epoch_1960 = Timestamp(1960, 1, 1)
3185-
units_from_epochs = list(range(5))
3185+
units_from_epochs = np.arange(5, dtype=np.int32)
31863186
expected = Series(
31873187
[pd.Timedelta(x, unit=units) + epoch_1960 for x in units_from_epochs]
31883188
)

0 commit comments

Comments
 (0)