From 67e5724996e195f3e0571500273ec61f820862dc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:09:05 +0000 Subject: [PATCH] style: pre-commit fixes --- include/pybind11/numpy.h | 4 ++-- tests/test_numpy_array.cpp | 30 ++++++++++++++---------------- tests/test_numpy_array.py | 17 +++++------------ 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h index 5ac6f85f0a..b7e346ef30 100644 --- a/include/pybind11/numpy.h +++ b/include/pybind11/numpy.h @@ -1437,7 +1437,7 @@ struct npy_format_descriptor -struct npy_format_descriptor> { +struct npy_format_descriptor> { static constexpr auto name = const_name("object"); static constexpr int value = npy_api::NPY_OBJECT_; @@ -1446,7 +1446,7 @@ struct npy_format_descriptor -struct npy_format_descriptor> { +struct npy_format_descriptor> { static constexpr auto name = const_name("object"); static constexpr int value = npy_api::NPY_OBJECT_; diff --git a/tests/test_numpy_array.cpp b/tests/test_numpy_array.cpp index c017f09862..a0e4273a55 100644 --- a/tests/test_numpy_array.cpp +++ b/tests/test_numpy_array.cpp @@ -528,23 +528,21 @@ TEST_SUBMODULE(numpy_array, sm) { return sum_str_values; }); - sm.def("pass_array_handle_return_sum_str_values", - [](const py::array_t &objs) { - std::string sum_str_values; - for (const auto &obj : objs) { - sum_str_values += py::str(obj.attr("value")); - } - return sum_str_values; - }); + sm.def("pass_array_handle_return_sum_str_values", [](const py::array_t &objs) { + std::string sum_str_values; + for (const auto &obj : objs) { + sum_str_values += py::str(obj.attr("value")); + } + return sum_str_values; + }); - sm.def("pass_array_object_return_sum_str_values", - [](const py::array_t &objs) { - std::string sum_str_values; - for (const auto &obj : objs) { - sum_str_values += py::str(obj.attr("value")); - } - return sum_str_values; - }); + sm.def("pass_array_object_return_sum_str_values", [](const py::array_t &objs) { + std::string sum_str_values; + for (const auto &obj : objs) { + sum_str_values += py::str(obj.attr("value")); + } + return sum_str_values; + }); sm.def("pass_array_pyobject_ptr_return_as_list", [](const py::array_t &objs) -> py::list { return objs; }); diff --git a/tests/test_numpy_array.py b/tests/test_numpy_array.py index 2bf5ad4e2c..7e7b4bec9c 100644 --- a/tests/test_numpy_array.py +++ b/tests/test_numpy_array.py @@ -618,9 +618,11 @@ def test_round_trip_float(): # other ref-count bugs. class PyValueHolder: counter = 0 + def __init__(self, value): self.value = value PyValueHolder.counter += 1 + def __del__(self): PyValueHolder.counter -= 1 @@ -646,9 +648,7 @@ def test_pass_array_object_return_sum_str_values_ndarray(func): for loop in range(100): # Intentionally all temporaries, do not change. assert ( - func( - np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object) - ) + func(np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object)) == "-3four5.0" ) assert PyValueHolder.counter == initial_counter @@ -666,12 +666,7 @@ def test_pass_array_object_return_sum_str_values_list(func): initial_counter = PyValueHolder.counter for loop in range(100): # Intentionally all temporaries, do not change. - assert ( - func( - WrapWithPyValueHolder(2, "three", -4.0) - ) - == "2three-4.0" - ) + assert func(WrapWithPyValueHolder(2, "three", -4.0)) == "2three-4.0" assert PyValueHolder.counter == initial_counter @@ -688,9 +683,7 @@ def test_pass_array_object_return_as_list(func): for loop in range(100): # Intentionally all temporaries, do not change. assert UnwrapPyValueHolder( - func( - np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object) - ) + func(np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object)) ) == [-1, "two", 3.0] assert PyValueHolder.counter == initial_counter