From 8020af4bed1033524e4281a69aac71c8aae35566 Mon Sep 17 00:00:00 2001 From: Terji Petersen Date: Thu, 1 Dec 2022 00:06:57 +0000 Subject: [PATCH] 32-bit stuff III --- pandas/tests/frame/methods/test_value_counts.py | 4 ++-- pandas/tests/groupby/aggregate/test_cython.py | 2 +- pandas/tests/groupby/test_min_max.py | 2 +- pandas/tests/groupby/test_nunique.py | 2 +- pandas/tests/groupby/test_size.py | 2 +- pandas/tests/indexes/test_index_new.py | 2 +- pandas/tests/indexing/multiindex/test_partial.py | 2 +- pandas/tests/indexing/test_loc.py | 12 ++++++------ pandas/tests/indexing/test_partial.py | 4 ++-- pandas/tests/reshape/merge/test_merge.py | 4 ++-- pandas/tests/reshape/test_pivot.py | 4 +--- pandas/tests/series/test_constructors.py | 2 +- pandas/tests/series/test_repr.py | 4 ++-- pandas/tests/window/test_groupby.py | 4 ++-- pandas/tests/window/test_pairwise.py | 2 +- 15 files changed, 25 insertions(+), 27 deletions(-) diff --git a/pandas/tests/frame/methods/test_value_counts.py b/pandas/tests/frame/methods/test_value_counts.py index 7bebefd941a7b4..9859ffb83da66a 100644 --- a/pandas/tests/frame/methods/test_value_counts.py +++ b/pandas/tests/frame/methods/test_value_counts.py @@ -88,7 +88,7 @@ def test_data_frame_value_counts_empty(): df_no_cols = pd.DataFrame() result = df_no_cols.value_counts() - expected = pd.Series([], dtype=np.int64, index=np.array([], dtype=np.int_)) + expected = pd.Series([], dtype=np.int64, index=np.array([], dtype=np.intp)) tm.assert_series_equal(result, expected) @@ -97,7 +97,7 @@ def test_data_frame_value_counts_empty_normalize(): df_no_cols = pd.DataFrame() result = df_no_cols.value_counts(normalize=True) - expected = pd.Series([], dtype=np.float64, index=np.array([], dtype=np.int_)) + expected = pd.Series([], dtype=np.float64, index=np.array([], dtype=np.intp)) tm.assert_series_equal(result, expected) diff --git a/pandas/tests/groupby/aggregate/test_cython.py b/pandas/tests/groupby/aggregate/test_cython.py index ba3114e07cf865..feef9d2c31acc8 100644 --- a/pandas/tests/groupby/aggregate/test_cython.py +++ b/pandas/tests/groupby/aggregate/test_cython.py @@ -212,7 +212,7 @@ def test_cython_agg_empty_buckets_nanops(observed): # GH-18869 can't call nanops on empty groups, so hardcode expected # for these df = DataFrame([11, 12, 13], columns=["a"]) - grps = np.arange(0, 25, 5, dtype=np.intp) + grps = np.arange(0, 25, 5, dtype=np.int_) # add / sum result = df.groupby(pd.cut(df["a"], grps), observed=observed)._cython_agg_general( "sum", alt=None, numeric_only=True diff --git a/pandas/tests/groupby/test_min_max.py b/pandas/tests/groupby/test_min_max.py index 078b02a8748e0a..f91d8c2f86d1ed 100644 --- a/pandas/tests/groupby/test_min_max.py +++ b/pandas/tests/groupby/test_min_max.py @@ -113,7 +113,7 @@ def test_max_inat_not_all_na(): # Note: in converting to float64, the iNaT + 1 maps to iNaT, i.e. is lossy expected = Series({1: np.nan, 2: np.nan, 3: iNaT + 1}) - expected.index = expected.index.astype(np.intp) + expected.index = expected.index.astype(np.int_) tm.assert_series_equal(result, expected, check_exact=True) diff --git a/pandas/tests/groupby/test_nunique.py b/pandas/tests/groupby/test_nunique.py index b1402a2c179478..9707ec32a9ce65 100644 --- a/pandas/tests/groupby/test_nunique.py +++ b/pandas/tests/groupby/test_nunique.py @@ -172,7 +172,7 @@ def test_nunique_preserves_column_level_names(): # GH 23222 test = DataFrame([1, 2, 2], columns=pd.Index(["A"], name="level_0")) result = test.groupby([0, 0, 0]).nunique() - expected = DataFrame([2], index=np.array([0], dtype=np.intp), columns=test.columns) + expected = DataFrame([2], index=np.array([0], dtype=np.int_), columns=test.columns) tm.assert_frame_equal(result, expected) diff --git a/pandas/tests/groupby/test_size.py b/pandas/tests/groupby/test_size.py index 2bb6a419752987..c0c98562eda682 100644 --- a/pandas/tests/groupby/test_size.py +++ b/pandas/tests/groupby/test_size.py @@ -37,7 +37,7 @@ def test_size_axis_1(df, axis_1, by, sort, dropna): if sort: expected = expected.sort_index() if tm.is_integer_dtype(expected.index) and not any(x is None for x in by): - expected.index = expected.index.astype(np.intp) + expected.index = expected.index.astype(np.int_) grouped = df.groupby(by=by, axis=axis_1, sort=sort, dropna=dropna) result = grouped.size() diff --git a/pandas/tests/indexes/test_index_new.py b/pandas/tests/indexes/test_index_new.py index de7dc19abfb158..faede0b3603af0 100644 --- a/pandas/tests/indexes/test_index_new.py +++ b/pandas/tests/indexes/test_index_new.py @@ -283,7 +283,7 @@ def test_constructor_int_dtype_nan_raises(self, dtype): ) def test_constructor_dtypes_to_int64(self, vals): index = Index(vals, dtype=int) - assert isinstance(index, NumericIndex) and index.dtype == np.intp + assert isinstance(index, NumericIndex) and index.dtype == np.int_ @pytest.mark.parametrize( "vals", diff --git a/pandas/tests/indexing/multiindex/test_partial.py b/pandas/tests/indexing/multiindex/test_partial.py index 5e231aadbb9724..0c63326118ac3a 100644 --- a/pandas/tests/indexing/multiindex/test_partial.py +++ b/pandas/tests/indexing/multiindex/test_partial.py @@ -156,7 +156,7 @@ def test_getitem_intkey_leading_level( mi = ser.index assert isinstance(mi, MultiIndex) if dtype is int: - assert mi.levels[0].dtype == np.intp + assert mi.levels[0].dtype == np.int_ else: assert mi.levels[0].dtype == np.float64 diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index acb6752e9e703d..8243c250af4a27 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -436,7 +436,7 @@ def test_loc_to_fail(self): ) msg = ( - rf"\"None of \[NumericIndex\(\[1, 2\], dtype='{np.intp().dtype}'\)\] are " + rf"\"None of \[NumericIndex\(\[1, 2\], dtype='{np.int_().dtype}'\)\] are " r"in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): @@ -454,7 +454,7 @@ def test_loc_to_fail2(self): s.loc[-1] msg = ( - rf"\"None of \[NumericIndex\(\[-1, -2\], dtype='{np.intp().dtype}'\)\] are " + rf"\"None of \[NumericIndex\(\[-1, -2\], dtype='{np.int_().dtype}'\)\] are " r"in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): @@ -470,7 +470,7 @@ def test_loc_to_fail2(self): s["a"] = 2 msg = ( - rf"\"None of \[NumericIndex\(\[-2\], dtype='{np.intp().dtype}'\)\] are " + rf"\"None of \[NumericIndex\(\[-2\], dtype='{np.int_().dtype}'\)\] are " r"in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): @@ -487,7 +487,7 @@ def test_loc_to_fail3(self): df = DataFrame([["a"], ["b"]], index=[1, 2], columns=["value"]) msg = ( - rf"\"None of \[NumericIndex\(\[3\], dtype='{np.intp().dtype}'\)\] are " + rf"\"None of \[NumericIndex\(\[3\], dtype='{np.int_().dtype}'\)\] are " r"in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): @@ -505,7 +505,7 @@ def test_loc_getitem_list_with_fail(self): s.loc[[2]] msg = ( - f"\"None of [NumericIndex([3], dtype='{np.intp().dtype}')] " + f"\"None of [NumericIndex([3], dtype='{np.int_().dtype}')] " 'are in the [index]"' ) with pytest.raises(KeyError, match=re.escape(msg)): @@ -1212,7 +1212,7 @@ def test_loc_setitem_empty_append_raises(self): df = DataFrame(columns=["x", "y"]) df.index = df.index.astype(np.int64) msg = ( - rf"None of \[NumericIndex\(\[0, 1\], dtype='{np.intp().dtype}'\)\] " + rf"None of \[NumericIndex\(\[0, 1\], dtype='{np.int_().dtype}'\)\] " r"are in the \[index\]" ) with pytest.raises(KeyError, match=msg): diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index c644fa7c9b91f2..35b6b9c25df3ef 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -403,7 +403,7 @@ def test_series_partial_set(self): # raises as nothing is in the index msg = ( - rf"\"None of \[NumericIndex\(\[3, 3, 3\], dtype='{np.intp().dtype}'\)\] " + rf"\"None of \[NumericIndex\(\[3, 3, 3\], dtype='{np.int_().dtype}'\)\] " r"are in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): @@ -484,7 +484,7 @@ def test_series_partial_set_with_name(self): # raises as nothing is in the index msg = ( - rf"\"None of \[NumericIndex\(\[3, 3, 3\], dtype='{np.intp().dtype}', " + rf"\"None of \[NumericIndex\(\[3, 3, 3\], dtype='{np.int_().dtype}', " r"name='idx'\)\] are in the \[index\]\"" ) with pytest.raises(KeyError, match=msg): diff --git a/pandas/tests/reshape/merge/test_merge.py b/pandas/tests/reshape/merge/test_merge.py index b7a3133cd421a7..d998a059e3578d 100644 --- a/pandas/tests/reshape/merge/test_merge.py +++ b/pandas/tests/reshape/merge/test_merge.py @@ -355,7 +355,7 @@ def test_merge_join_key_dtype_cast(self): lkey = np.array([1]) rkey = np.array([2]) df = merge(df1, df2, left_on=lkey, right_on=rkey, how="outer") - assert df["key_0"].dtype == "intp" + assert df["key_0"].dtype == "int_" def test_handle_join_key_pass_array(self): left = DataFrame( @@ -379,7 +379,7 @@ def test_handle_join_key_pass_array(self): rkey = np.array([1, 1, 2, 3, 4, 5]) merged = merge(left, right, left_on=lkey, right_on=rkey, how="outer") - expected = Series([1, 1, 1, 1, 2, 2, 3, 4, 5], dtype=np.intp, name="key_0") + expected = Series([1, 1, 1, 1, 2, 2, 3, 4, 5], dtype=np.int_, name="key_0") tm.assert_series_equal(merged["key_0"], expected) left = DataFrame({"value": np.arange(3)}) diff --git a/pandas/tests/reshape/test_pivot.py b/pandas/tests/reshape/test_pivot.py index c42d1c0855c5cc..36784bfd5a9758 100644 --- a/pandas/tests/reshape/test_pivot.py +++ b/pandas/tests/reshape/test_pivot.py @@ -2052,9 +2052,7 @@ def __init__(self, *args, **kwargs) -> None: msg = "The following operation may generate" with tm.assert_produces_warning(PerformanceWarning, match=msg): with pytest.raises(Exception, match="Don't compute final result."): - df.pivot_table( - index="ind1", columns="ind2", values="count", aggfunc="count" - ) + df.pivot_table(index="ind1", columns="ind2", values="count", aggfunc="count") def test_pivot_table_aggfunc_dropna(self, dropna): # GH 22159 diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index eada4f7fbaf97c..9e507387e87a36 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -1199,7 +1199,7 @@ def test_construction_interval(self, interval_constructor): # construction from interval & array of intervals intervals = interval_constructor.from_breaks(np.arange(3), closed="right") result = Series(intervals) - assert result.dtype == f"interval[{np.intp().dtype}, right]" + assert result.dtype == f"interval[{np.int_().dtype}, right]" tm.assert_index_equal(Index(result.values), Index(intervals)) @pytest.mark.parametrize( diff --git a/pandas/tests/series/test_repr.py b/pandas/tests/series/test_repr.py index 2652b0af940ffd..57dcd06f8f5240 100644 --- a/pandas/tests/series/test_repr.py +++ b/pandas/tests/series/test_repr.py @@ -333,7 +333,7 @@ def test_categorical_series_repr(self): 8 8 9 9 dtype: category -Categories (10, {np.intp().dtype}): [0, 1, 2, 3, ..., 6, 7, 8, 9]""" +Categories (10, {np.int_().dtype}): [0, 1, 2, 3, ..., 6, 7, 8, 9]""" assert repr(s) == exp @@ -359,7 +359,7 @@ def test_categorical_series_repr_ordered(self): 8 8 9 9 dtype: category -Categories (10, {np.intp().dtype}): [0 < 1 < 2 < 3 ... 6 < 7 < 8 < 9]""" +Categories (10, {np.int_().dtype}): [0 < 1 < 2 < 3 ... 6 < 7 < 8 < 9]""" assert repr(s) == exp diff --git a/pandas/tests/window/test_groupby.py b/pandas/tests/window/test_groupby.py index 4269a291855e18..2cfd03b69d540b 100644 --- a/pandas/tests/window/test_groupby.py +++ b/pandas/tests/window/test_groupby.py @@ -920,8 +920,8 @@ def test_nan_and_zero_endpoints(self): name="adl2", index=MultiIndex.from_arrays( [ - Index([0] * 999 + [1], dtype=np.intp, name="index"), - Index([0] * 999 + [1], dtype=np.intp, name="index"), + Index([0] * 999 + [1], dtype=np.int_, name="index"), + Index([0] * 999 + [1], dtype=np.int_, name="index"), ], ), ) diff --git a/pandas/tests/window/test_pairwise.py b/pandas/tests/window/test_pairwise.py index 7370c829d88923..9e6b9740fee89d 100644 --- a/pandas/tests/window/test_pairwise.py +++ b/pandas/tests/window/test_pairwise.py @@ -99,7 +99,7 @@ def test_flex_binary_frame(method, frame): exp = DataFrame( {k: getattr(frame[k].rolling(window=10), method)(frame2[k]) for k in frame} ) - exp.columns = exp.columns.astype(np.intp) + exp.columns = exp.columns.astype(np.int_) tm.assert_frame_equal(res3, exp)