Skip to content

Commit 8b52054

Browse files
Terji PetersenTerji Petersen
Terji Petersen
authored and
Terji Petersen
committed
see if intp fixes int32 problems
1 parent b332214 commit 8b52054

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

pandas/core/indexes/base.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ def _ensure_array(cls, data, dtype, copy: bool):
555555
data = data.copy()
556556
return data
557557

558-
@final
558+
# @final (temporary off until merge NumericIndex into Index
559559
@classmethod
560560
def _dtype_to_subclass(cls, dtype: DtypeObj):
561561
# Delay import for perf. https://github.com/pandas-dev/pandas/pull/31423
@@ -1051,6 +1051,7 @@ def astype(self, dtype, copy: bool = True):
10511051
UInt64Index,
10521052
)
10531053

1054+
klass: Index
10541055
if is_signed_integer_dtype(dtype):
10551056
klass = Int64Index
10561057
elif is_unsigned_integer_dtype(dtype):

pandas/tests/window/test_groupby.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,10 @@ def test_nan_and_zero_endpoints(self):
919919
arr,
920920
name="adl2",
921921
index=MultiIndex.from_arrays(
922-
[[0] * 999 + [1], [0] * 999 + [1]], names=["index", "index"]
922+
[
923+
Index([0] * 999 + [1], dtype=np.intp, name="index"),
924+
Index([0] * 999 + [1], dtype=np.intp, name="index"),
925+
],
923926
),
924927
)
925928
tm.assert_series_equal(result, expected)

pandas/tests/window/test_pairwise.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ def test_flex_binary_frame(method, frame):
9999
exp = DataFrame(
100100
{k: getattr(frame[k].rolling(window=10), method)(frame2[k]) for k in frame}
101101
)
102+
exp.columns = exp.columns.astype(np.intp)
102103
tm.assert_frame_equal(res3, exp)
103104

104105

@@ -431,7 +432,11 @@ def test_multindex_columns_pairwise_func(self):
431432
expected = DataFrame(
432433
np.nan,
433434
index=MultiIndex.from_arrays(
434-
[np.repeat(np.arange(5), 2), ["M", "N"] * 5, ["P", "Q"] * 5],
435+
[
436+
np.repeat(np.arange(5, dtype=np.int64), 2),
437+
["M", "N"] * 5,
438+
["P", "Q"] * 5,
439+
],
435440
names=[None, "a", "b"],
436441
),
437442
columns=columns,

0 commit comments

Comments
 (0)