Skip to content

fix(types): update NDArray[object] to be NDArray[numpy.object_] #5571

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 3 commits into from
Mar 21, 2025
+8 −1
Merged

fix(types): update NDArray[object] to be NDArray[numpy.object_] #5571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f97396
fix numpy.object_
InvincibleRMC Mar 18, 2025
49f6bf4
style: pre-commit fixes
pre-commit-ci[bot] Mar 18, 2025
19340bb
Merge branch 'pybind:master' into use-numpy.object_
InvincibleRMC Mar 20, 2025
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 include/pybind11/numpy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ struct npy_format_descriptor<
enable_if_t<is_same_ignoring_cvref<T, PyObject *>::value
|| ((std::is_same<T, handle>::value || std::is_same<T, object>::value)
&& sizeof(T) == sizeof(PyObject *))>> {
static constexpr auto name = const_name("object");
static constexpr auto name = const_name("numpy.object_");

static constexpr int value = npy_api::NPY_OBJECT_;

Expand Down
7 changes: 7 additions & 0 deletions tests/test_numpy_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,13 @@ def test_constructors():
assert results["array_t<double>"].dtype == np.float64


def test_array_object_type(doc):
assert (
doc(m.pass_array_object_return_as_list)
== "pass_array_object_return_as_list(arg0: typing.Annotated[numpy.typing.ArrayLike, numpy.object_]) -> list"
)


def test_overload_resolution(msg):
# Exact overload matches:
assert m.overloaded(np.array([1], dtype="float64")) == "double"
Expand Down
Loading