Skip to content

Commit

Permalink
Replace numpy.bool8 with numpy.bool_ (#12690)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrocklin authored and bryevdv committed Feb 21, 2023
1 parent b521165 commit 429f2b9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/bokeh/core/property/primitive.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Globals and constants
#-----------------------------------------------------------------------------

bokeh_bool_types = (bool, np.bool8)
bokeh_bool_types = (bool, np.bool_)
bokeh_integer_types = (numbers.Integral,)

__all__ = (
Expand Down
16 changes: 8 additions & 8 deletions tests/unit/bokeh/core/property/test_primitive.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def test_valid(self) -> None:
assert prop.is_valid(False)
assert prop.is_valid(True)

assert prop.is_valid(np.bool8(False))
assert prop.is_valid(np.bool8(True))
assert prop.is_valid(np.bool_(False))
assert prop.is_valid(np.bool_(True))

def test_invalid(self) -> None:
prop = bcpp.Bool()
Expand Down Expand Up @@ -167,8 +167,8 @@ def test_invalid(self) -> None:
assert not prop.is_valid(_TestHasProps())
assert not prop.is_valid(_TestModel())

assert not prop.is_valid(np.bool8(False))
assert not prop.is_valid(np.bool8(True))
assert not prop.is_valid(np.bool_(False))
assert not prop.is_valid(np.bool_(True))

def test_has_ref(self) -> None:
prop = bcpp.Complex()
Expand Down Expand Up @@ -227,8 +227,8 @@ def test_invalid(self) -> None:
assert not prop.is_valid(_TestHasProps())
assert not prop.is_valid(_TestModel())

assert not prop.is_valid(np.bool8(False))
assert not prop.is_valid(np.bool8(True))
assert not prop.is_valid(np.bool_(False))
assert not prop.is_valid(np.bool_(True))
assert not prop.is_valid(np.complex64(1.0+1.0j))
assert not prop.is_valid(np.complex128(1.0+1.0j))
if hasattr(np, "complex256"):
Expand Down Expand Up @@ -359,8 +359,8 @@ def test_invalid(self) -> None:
assert not prop.is_valid(_TestHasProps())
assert not prop.is_valid(_TestModel())

assert not prop.is_valid(np.bool8(False))
assert not prop.is_valid(np.bool8(True))
assert not prop.is_valid(np.bool_(False))
assert not prop.is_valid(np.bool_(True))
assert not prop.is_valid(np.float16(0))
assert not prop.is_valid(np.float16(1))
assert not prop.is_valid(np.float32(0))
Expand Down

0 comments on commit 429f2b9

Please sign in to comment.