Skip to content

Backport PR #49886 on branch 1.5.x (CI: Remove deprecated numpy dtype aliases) #49887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asv_bench/benchmarks/sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,12 @@ def setup(self, fill_value):
d = 1e-5
arr = make_array(N, d, np.nan, np.float64)
self.sp_arr = SparseArray(arr)
b_arr = np.full(shape=N, fill_value=fill_value, dtype=np.bool8)
b_arr = np.full(shape=N, fill_value=fill_value, dtype=np.bool_)
fv_inds = np.unique(
np.random.randint(low=0, high=N - 1, size=int(N * d), dtype=np.int32)
)
b_arr[fv_inds] = True if pd.isna(fill_value) else not fill_value
self.sp_b_arr = SparseArray(b_arr, dtype=np.bool8, fill_value=fill_value)
self.sp_b_arr = SparseArray(b_arr, dtype=np.bool_, fill_value=fill_value)

def time_mask(self, fill_value):
self.sp_arr[self.sp_b_arr]
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/arrays/sparse/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ def isna(self):
dtype = SparseDtype(bool, self._null_fill_value)
if self._null_fill_value:
return type(self)._simple_new(isna(self.sp_values), self.sp_index, dtype)
mask = np.full(len(self), False, dtype=np.bool8)
mask = np.full(len(self), False, dtype=np.bool_)
mask[self.sp_index.indices] = isna(self.sp_values)
return type(self)(mask, fill_value=False, dtype=dtype)

Expand Down Expand Up @@ -1043,7 +1043,7 @@ def __getitem__(
if not key.fill_value:
return self.take(key.sp_index.indices)
n = len(self)
mask = np.full(n, True, dtype=np.bool8)
mask = np.full(n, True, dtype=np.bool_)
mask[key.sp_index.indices] = False
return self.take(np.arange(n)[mask])
else:
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/interchange/column.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def _get_validity_buffer(self) -> tuple[PandasBuffer, Any]:
valid = invalid == 0
invalid = not valid

mask = np.zeros(shape=(len(buf),), dtype=np.bool8)
mask = np.zeros(shape=(len(buf),), dtype=np.bool_)
for i, obj in enumerate(buf):
mask[i] = valid if isinstance(obj, str) else invalid

Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/arrays/sparse/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_boolean_slice_empty(self):

def test_getitem_bool_sparse_array(self):
# GH 23122
spar_bool = SparseArray([False, True] * 5, dtype=np.bool8, fill_value=True)
spar_bool = SparseArray([False, True] * 5, dtype=np.bool_, fill_value=True)
exp = SparseArray([np.nan, 2, np.nan, 5, 6])
tm.assert_sp_array_equal(arr[spar_bool], exp)

Expand All @@ -95,7 +95,7 @@ def test_getitem_bool_sparse_array(self):
tm.assert_sp_array_equal(res, exp)

spar_bool = SparseArray(
[False, True, np.nan] * 3, dtype=np.bool8, fill_value=np.nan
[False, True, np.nan] * 3, dtype=np.bool_, fill_value=np.nan
)
res = arr[spar_bool]
exp = SparseArray([np.nan, 3, 5])
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/arrays/sparse/test_reductions.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def test_sum_min_count(self, arr, fill_value, min_count, expected):
assert result == expected

def test_bool_sum_min_count(self):
spar_bool = SparseArray([False, True] * 5, dtype=np.bool8, fill_value=True)
spar_bool = SparseArray([False, True] * 5, dtype=np.bool_, fill_value=True)
res = spar_bool.sum(min_count=1)
assert res == 5
res = spar_bool.sum(min_count=11)
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/arrays/sparse/test_unary.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ def test_abs_operator(self):
tm.assert_sp_array_equal(exp, res)

def test_invert_operator(self):
arr = SparseArray([False, True, False, True], fill_value=False, dtype=np.bool8)
arr = SparseArray([False, True, False, True], fill_value=False, dtype=np.bool_)
exp = SparseArray(
np.invert([False, True, False, True]), fill_value=True, dtype=np.bool8
np.invert([False, True, False, True]), fill_value=True, dtype=np.bool_
)
res = ~arr
tm.assert_sp_array_equal(exp, res)
Expand Down
9 changes: 4 additions & 5 deletions pandas/tests/io/excel/test_writers.py
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,14 @@ def test_float_types(self, np_type, path):

tm.assert_frame_equal(df, recons)

@pytest.mark.parametrize("np_type", [np.bool8, np.bool_])
def test_bool_types(self, np_type, path):
# Test np.bool8 and np.bool_ values read come back as float.
df = DataFrame([1, 0, True, False], dtype=np_type)
def test_bool_types(self, path):
# Test np.bool_ values read come back as float.
df = DataFrame([1, 0, True, False], dtype=np.bool_)
df.to_excel(path, "test1")

with ExcelFile(path) as reader:
recons = pd.read_excel(reader, sheet_name="test1", index_col=0).astype(
np_type
np.bool_
)

tm.assert_frame_equal(df, recons)
Expand Down