Skip to content

[X-0] Further numpy fixes #1156

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

Merged
merged 1 commit into from
Jun 27, 2023
Merged

[X-0] Further numpy fixes #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions labelbox/data/annotation_types/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,15 @@ def validate(cls, val, field: ModelField):
return val


if version.parse(np.__version__) >= version.parse('1.23.0'):
if version.parse(np.__version__) >= version.parse('1.25.0'):
from typing import GenericAlias
TypedArray = GenericAlias(_TypedArray, (Any, DType))
elif version.parse(np.__version__) >= version.parse('1.23.0'):
from numpy._typing import _GenericAlias
TypedArray = _GenericAlias(_TypedArray, (Any, DType))
elif version.parse('1.22.0') <= version.parse(
np.__version__) < version.parse('1.23.0'):
from numpy.typing import _GenericAlias
TypedArray = _GenericAlias(_TypedArray, (Any, DType))
else:
TypedArray = _TypedArray[Any, DType]
TypedArray = _TypedArray[Any, DType]
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"tqdm",
"python-dateutil>=2.8.2,<2.9.0",
'numpy==1.21.6; python_version<"3.8"',
'numpy~=1.23.5; python_version>="3.8"',
'numpy~=1.23.5; python_version=="3.8"',
'numpy~=1.25.0; python_version>"3.8"',
],
extras_require={
'data': [
Expand Down