Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Numpy 2.0 support #1306

Merged
merged 4 commits into from
Apr 8, 2024
Merged

Numpy 2.0 support #1306

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90ad4cb
Numpy 2.0 support
hoxbro Nov 6, 2023
5e12da6
Update datashader/datashape/coretypes.py
hoxbro Nov 6, 2023
ce15d54
Update datashader/datashape/coretypes.py
hoxbro Feb 2, 2024
5e54e2b
Merge branch 'main' into npy2
hoxbro Feb 13, 2024
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
2 changes: 1 addition & 1 deletion datashader/datashape/coretypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ def from_numpy_dtype(self, dt):
elif np.issubdtype(dt, np.timedelta64):
unit, _ = np.datetime_data(dt)
return TimeDelta(unit=unit)
elif np.issubdtype(dt, np.unicode_):
elif np.__version__[0] < "2" and np.issubdtype(dt, np.unicode_): # noqa: NPY201
return String(dt.itemsize // 4, 'U32')
elif np.issubdtype(dt, np.str_) or np.issubdtype(dt, np.bytes_):
return String(dt.itemsize, 'ascii')
Expand Down
Loading