Merge 'upstream/master' (v2.11.1, 8a099e44b) #64

EricCousineau-TRI · 2023-10-12T23:33:09Z

Coarse notes on how merges were attempted:
https://github.com/EricCousineau-TRI/repro/blob/d476556c8d273b9a26f23adf3bbba798b317578b/drake_stuff/pybind_update_2023/README.md

This change is

…aling (pybind#3970) * Add object rvalue overload for accessors. Enables reference stealing * Fix comments * Fix more comment typos * Fix bug * reorder declarations for clarity * fix another perf bug * should be static * future proof operator overloads * Fix perfect forwarding * Add a couple of tests * Remove errant include * Improve test documentation * Add dict test * add object attr tests * Optimize STL map caster and cleanup enum * Reorder to match declarations * adjust increfs * Remove comment * revert value change * add missing move

@YannickJadoul

* error_already_set::what() is now constructed lazily Prior to this commit throwing error_already_set was expensive due to the eager construction of the error string (which required traversing the Python stack). See pybind#1853 for more context and an alternative take on the issue. Note that error_already_set no longer inherits from std::runtime_error because the latter has no default constructor. * Do not attempt to normalize if no exception occurred This is not supported on PyPy-2.7 5.8.0. * Extract exception name via tp_name This is faster than dynamically looking up __name__ via GetAttrString. Note though that the runtime of the code throwing an error_already_set will be dominated by stack unwinding so the improvement will not be noticeable. Before: 396 ns ± 0.913 ns per loop (mean ± std. dev. of 7 runs, 1000000 loops each) After: 277 ns ± 0.549 ns per loop (mean ± std. dev. of 7 runs, 1000000 loops each) Benchmark: const std::string foo() { PyErr_SetString(PyExc_KeyError, ""); const std::string &s = py::detail::error_string(); PyErr_Clear(); return s; } PYBIND11_MODULE(foo, m) { m.def("foo", &::foo); } * Reverted error_already_set to subclass std::runtime_error * Revert "Extract exception name via tp_name" The implementation of __name__ is slightly more complex than that. It handles the module name prefix, and heap-allocated types. We could port it to pybind11 later on but for now it seems like an overkill. This reverts commit f1435c7. * Cosmit following @YannickJadoul's comments Note that detail::error_string() no longer calls PyException_SetTraceback as it is unncessary for pretty-printing the exception. * Fixed PyPy build * Moved normalization to error_already_set ctor * Fix merge bugs * Fix more merge errors * Improve formatting * Improve error message in rare case * Revert back if statements * Fix clang-tidy * Try removing mutable * Does build_mode release fix it * Set to Debug to expose segfault * Fix remove set error string * Do not run error_string() more than once * Trying setting the tracebackk to the value * guard if m_type is null * Try to debug PGI * One last try for PGI * Does reverting this fix PyPy * Reviewer suggestions * Remove unnecessary initialization * Add noexcept move and explicit fail throw * Optimize error_string creation * Fix typo * Revert noexcept * Fix merge conflict error * Abuse assignment operator * Revert operator abuse * See if we still need debug * Remove unnecessary mutable * Report "FATAL failure building pybind11::error_already_set error_string" and terminate process. * Try specifying noexcept again * Try explicit ctor * default ctor is noexcept too * Apply reviewer suggestions, simplify code, and make helper method private * Remove unnecessary include * Clang-Tidy fix * detail::obj_class_name(), fprintf with [STDERR], [STDOUT] tags, polish comments * consistently check m_lazy_what.empty() also in production builds * Make a comment slightly less ambiguous. * Bug fix: Remove `what();` from `restore()`. It sure would need to be guarded by `if (m_type)`, otherwise `what()` fails and masks that no error was set (see update unit test). But since `error_already_set` is copyable, there is no point in releasing m_type, m_value, m_trace, therefore we can just as well avoid the runtime overhead of force-building `m_lazy_what`, it may never be used. * Replace extremely opaque (unhelpful) error message with a truthful reflection of what we know. * Fix clang-tidy error [performance-move-constructor-init]. * Make expected error message less specific. * Various changes. * bug fix: error_string(PyObject **, ...) * Putting back the two eager PyErr_NormalizeException() calls. * Change error_already_set() to call pybind11_fail() if the Python error indicator not set. The net result is that a std::runtime_error is thrown instead of error_already_set, but all tests pass as is. * Remove mutable (fixes oversight in the previous commit). * Normalize the exception only locally in error_string(). Python 3.6 & 3.7 test failures expected. This is meant for benchmarking, to determine if it is worth the trouble looking into the failures. * clang-tidy: use auto * Use `gil_scoped_acquire_local` in `error_already_set` destructor. See long comment. * For Python < 3.8: `PyErr_NormalizeException` before `PyErr_WriteUnraisable` * Go back to replacing the held Python exception with then normalized exception, if & when needed. Consistently document the side-effect. * Slightly rewording comment. (There were also other failures.) * Add 1-line comment for obj_class_name() * Benchmark code, with results in this commit message. function #calls test time [s] μs / call master pure_unwind 729540 1.061 14.539876 err_set_unwind_err_clear 681476 1.040 15.260282 err_set_error_already_set 508038 1.049 20.640525 error_already_set_restore 555578 1.052 18.933288 pr1895_original_foo 244113 1.050 43.018168 PR / master PR pybind#1895 pure_unwind 736981 1.054 14.295685 98.32% err_set_unwind_err_clear 685820 1.045 15.237399 99.85% err_set_error_already_set 661374 1.046 15.811879 76.61% error_already_set_restore 669881 1.048 15.645176 82.63% pr1895_original_foo 318243 1.059 33.290806 77.39% master @ commit ad146b2 Running tests in directory "/usr/local/google/home/rwgk/forked/pybind11/tests": ============================= test session starts ============================== platform linux -- Python 3.9.10, pytest-6.2.3, py-1.10.0, pluggy-0.13.1 -- /usr/bin/python3 cachedir: .pytest_cache rootdir: /usr/local/google/home/rwgk/forked/pybind11/tests, configfile: pytest.ini collecting ... collected 5 items test_perf_error_already_set.py::test_perf[pure_unwind] PERF pure_unwind,729540,1.061,14.539876 PASSED test_perf_error_already_set.py::test_perf[err_set_unwind_err_clear] PERF err_set_unwind_err_clear,681476,1.040,15.260282 PASSED test_perf_error_already_set.py::test_perf[err_set_error_already_set] PERF err_set_error_already_set,508038,1.049,20.640525 PASSED test_perf_error_already_set.py::test_perf[error_already_set_restore] PERF error_already_set_restore,555578,1.052,18.933288 PASSED test_perf_error_already_set.py::test_perf[pr1895_original_foo] PERF pr1895_original_foo,244113,1.050,43.018168 PASSED ============================== 5 passed in 12.38s ============================== pr1895 @ commit 8dff51d Running tests in directory "/usr/local/google/home/rwgk/forked/pybind11/tests": ============================= test session starts ============================== platform linux -- Python 3.9.10, pytest-6.2.3, py-1.10.0, pluggy-0.13.1 -- /usr/bin/python3 cachedir: .pytest_cache rootdir: /usr/local/google/home/rwgk/forked/pybind11/tests, configfile: pytest.ini collecting ... collected 5 items test_perf_error_already_set.py::test_perf[pure_unwind] PERF pure_unwind,736981,1.054,14.295685 PASSED test_perf_error_already_set.py::test_perf[err_set_unwind_err_clear] PERF err_set_unwind_err_clear,685820,1.045,15.237399 PASSED test_perf_error_already_set.py::test_perf[err_set_error_already_set] PERF err_set_error_already_set,661374,1.046,15.811879 PASSED test_perf_error_already_set.py::test_perf[error_already_set_restore] PERF error_already_set_restore,669881,1.048,15.645176 PASSED test_perf_error_already_set.py::test_perf[pr1895_original_foo] PERF pr1895_original_foo,318243,1.059,33.290806 PASSED ============================== 5 passed in 12.40s ============================== clang++ -o pybind11/tests/test_perf_error_already_set.os -c -std=c++17 -fPIC -fvisibility=hidden -Os -flto -Wall -Wextra -Wconversion -Wcast-qual -Wdeprecated -Wnon-virtual-dtor -Wunused-result -isystem /usr/include/python3.9 -isystem /usr/include/eigen3 -DPYBIND11_STRICT_ASSERTS_CLASS_HOLDER_VS_TYPE_CASTER_MIX -DPYBIND11_TEST_BOOST -Ipybind11/include -I/usr/local/google/home/rwgk/forked/pybind11/include -I/usr/local/google/home/rwgk/clone/pybind11/include /usr/local/google/home/rwgk/forked/pybind11/tests/test_perf_error_already_set.cpp clang++ -o lib/pybind11_tests.so -shared -fPIC -Os -flto -shared ... Debian clang version 13.0.1-3+build2 Target: x86_64-pc-linux-gnu Thread model: posix * Changing call_repetitions_target_elapsed_secs to 0.1 for regular unit testing. * Adding in `recursion_depth` * Optimized ctor * Fix silly bug in recurse_first_then_call() * Add tests that have equivalent PyErr_Fetch(), PyErr_Restore() but no try-catch. * Add call_error_string to tests. Sample only recursion_depth 0, 100. * Show lazy-what speed-up in percent. * Include real_work in benchmarks. * Replace all PyErr_SetString() with generate_python_exception_with_traceback() * Better organization of test loops. * Add test_error_already_set_copy_move * Fix bug in newly added test (discovered by clang-tidy): actually use move ctor * MSVC detects the unreachable return * change test_perf_error_already_set.py back to quick mode * Inherit from std::exception (instead of std::runtime_error, which does not make sense anymore with the lazy what) * Special handling under Windows. * print with leading newline * Removing test_perf_error_already_set (copies are under rwgk/rwgk_tbx@7765113). * Avoid gil and scope overhead if there is nothing to release. * Restore default move ctor. "member function" instead of "function" (note that "method" is Python terminology). * Delete error_already_set copy ctor. * Make restore() non-const again to resolve clang-tidy failure (still experimenting). * Bring back error_already_set copy ctor, to see if that resolves the 4 MSVC test failures. * Add noexcept to error_already_set copy & move ctors (as suggested by @Skylion007 IIUC). * Trying one-by-one noexcept copy ctor for old compilers. * Add back test covering copy ctor. Add another simple test that exercises the copy ctor. * Exclude more older compilers from using the noexcept = default ctors. (The tests in the previous commit exposed that those are broken.) * Factor out & reuse gil_scoped_acquire_local as gil_scoped_acquire_simple * Guard gil_scoped_acquire_simple by _Py_IsFinalizing() check. * what() GIL safety * clang-tidy & Python 3.6 fixes * Use `gil_scoped_acquire` in dtor, copy ctor, `what()`. Remove `_Py_IsFinalizing()` checks (they are racy: python/cpython#28525). * Remove error_scope from copy ctor. * Add `error_scope` to `get_internals()`, to cover the situation that `get_internals()` is called from the `error_already_set` dtor while a new Python error is in flight already. Also backing out `gil_scoped_acquire_simple` change. * Add `FlakyException` tests with failure triggers in `__init__` and `__str__` THIS IS STILL A WORK IN PROGRESS. This commit is only an important resting point. This commit is a first attempt at addressing the observation that `PyErr_NormalizeException()` completely replaces the original exception if `__init__` fails. This can be very confusing even in small applications, and extremely confusing in large ones. * Tweaks to resolve Py 3.6 and PyPy CI failures. * Normalize Python exception immediately in error_already_set ctor. For background see: pybind#1895 (comment) * Fix oversights based on CI failures (copy & move ctor initialization). * Move @pytest.mark.xfail("env.PYPY") after @pytest.mark.parametrize(...) * Use @pytest.mark.skipif (xfail does not work for segfaults, of course). * Remove unused obj_class_name_or() function (it was added only under this PR). * Remove already obsolete C++ comments and code that were added only under this PR. * Slightly better (newly added) comments. * Factor out detail::error_fetch_and_normalize. Preparation for producing identical results from error_already_set::what() and detail::error_string(). Note that this is a very conservative refactoring. It would be much better to first move detail::error_string into detail/error_string.h * Copy most of error_string() code to new error_fetch_and_normalize::complete_lazy_error_string() * Remove all error_string() code from detail/type_caster_base.h. Note that this commit includes a subtle bug fix: previously error_string() restored the Python error, which will upset pybind11_fail(). This never was a problem in practice because the two PyType_Ready() calls in detail/class.h do not usually fail. * Return const std::string& instead of const char * and move error_string() to pytypes.h * Remove gil_scope_acquire from error_fetch_and_normalize, add back to error_already_set * Better handling of FlakyException __str__ failure. * Move error_fetch_and_normalize::complete_lazy_error_string() implementation from pybind11.h to pytypes.h * Add error_fetch_and_normalize::release_py_object_references() and use from error_already_set dtor. * Use shared_ptr for m_fetched_error => 1. non-racy, copy ctor that does not need the GIL; 2. enables guard against duplicate restore() calls. * Add comments. * Trivial renaming of a newly introduced member function. * Workaround for PyPy * Bug fix (oversight). Only valgrind got this one. * Use shared_ptr custom deleter for m_fetched_error in error_already_set. This enables removing the dtor, copy ctor, move ctor completely. * Further small simplification. With the GIL held, simply deleting the raw_ptr takes care of everything. * IWYU cleanup ``` iwyu version: include-what-you-use 0.17 based on Debian clang version 13.0.1-3+build2 ``` Command used: ``` iwyu -c -std=c++17 -DPYBIND11_TEST_BOOST -Iinclude/pybind11 -I/usr/include/python3.9 -I/usr/include/eigen3 include/pybind11/pytypes.cpp ``` pytypes.cpp is a temporary file: `#include "pytypes.h"` The raw output is very long and noisy. I decided to use `#include <cstddef>` instead of `#include <cstdio>` for `std::size_t` (iwyu sticks to the manual choice). I ignored all iwyu suggestions that are indirectly covered by `#include <Python.h>`. I manually verified that all added includes are actually needed. Co-authored-by: Aaron Gokaslan <[email protected]> Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>

* enable two new clang-tidy checks * Use better loop var for char

updates: - [github.com/asottile/pyupgrade: v2.32.1 → v2.33.0](asottile/pyupgrade@v2.32.1...v2.33.0) - [github.com/Lucas-C/pre-commit-hooks: v1.1.13 → v1.2.0](Lucas-C/pre-commit-hooks@v1.1.13...v1.2.0) - [github.com/hadialqattan/pycln: v1.3.2 → v1.3.3](hadialqattan/pycln@v1.3.2...v1.3.3) - [github.com/PyCQA/pylint: v2.13.8 → v2.14.1](pylint-dev/pylint@v2.13.8...v2.14.1) - [github.com/pre-commit/mirrors-mypy: v0.950 → v0.960](pre-commit/mirrors-mypy@v0.950...v0.960) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

…#3995)

* emplace field descriptors * reserve sufficient capacity * remove std::move * properly iterate through dict * make handle casting more explicit * Revert to old dict api

Bumps [pre-commit/action](https://github.com/pre-commit/action) from 2.0.3 to 3.0.0. - [Release notes](https://github.com/pre-commit/action/releases) - [Commits](pre-commit/action@v2.0.3...v3.0.0) --- updated-dependencies: - dependency-name: pre-commit/action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

updates: - [github.com/PyCQA/pylint: v2.14.1 → v2.14.3](pylint-dev/pylint@v2.14.1...v2.14.3) - [github.com/pre-commit/mirrors-clang-format: v14.0.4-1 → v14.0.5](pre-commit/mirrors-clang-format@v14.0.4-1...v14.0.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Signed-off-by: Henry Schreiner <[email protected]>

updates: - [github.com/hadialqattan/pycln: v1.3.3 → v1.3.5](hadialqattan/pycln@v1.3.3...v1.3.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Fix binding of `Pet::Attributes` * omit `attributes` as it's not needed Signed-off-by: Masaki Kozuki <[email protected]>

When converting an array to an Eigen matrix, ignore the strides if any dimension size is 0. If the array is empty, the strides aren't relevant, and especially numpy ≥ 1.23 explicitly sets the strides to 0 in this case. (See numpy commit dd5ab7b11520.) Update tests to verify that this works, and continues to work.

Ignores no longer needed after April 2022. Dependabot keeps the same style pinning now.

* chore(deps): bump actions/setup-python from 3 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Apply suggestions from code review Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner <[email protected]>

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 22.3.0 → 22.6.0](psf/black@22.3.0...22.6.0) - [github.com/Lucas-C/pre-commit-hooks: v1.2.0 → v1.3.0](Lucas-C/pre-commit-hooks@v1.2.0...v1.3.0) - [github.com/PyCQA/pylint: v2.14.3 → v2.14.4](pylint-dev/pylint@v2.14.3...v2.14.4) - [github.com/pre-commit/mirrors-clang-format: v14.0.5 → v14.0.6](pre-commit/mirrors-clang-format@v14.0.5...v14.0.6) * Update blacken-docs Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Aaron Gokaslan <[email protected]>

* Placeholder commit for 3.11 testing * Does this fix it? * Try suggestion * Placeholder commit for 3.11 testing * Does this fix it? * Try suggestion * fix: try using modern init for embedded interp Signed-off-by: Henry Schreiner <[email protected]> * fix: error message changed in 3.11 * fix: apply logic in Python manually Signed-off-by: Henry Schreiner <[email protected]> * fix autodetect dynamic attrs in 3.11 * fix: include error message if possible in error Signed-off-by: Henry Schreiner <[email protected]> * ci: enable standard Python 3.11 testing Signed-off-by: Henry Schreiner <[email protected]> * Make dynamic attrs condtiion exclusive to ver. Co-authored-by: Henry Schreiner <[email protected]>

Signed-off-by: Henry Schreiner <[email protected]>

@Skylion007

* Report `C++ Info:` from `pytest_configure()` * Use pytest_report_header() as suggested by @Skylion007

… namespace detail). (pybind#4049) Very minor refactoring to ease development and debugging. Having to declare a local `std::string` has bugged me many times. Nice to get this little nuisance out of the way. Extracted from PR pybind#4022, where it is used like this: ``` std::fprintf(stdout, "\nTYPE_CASTER_ODR_GUARD_IMPL %s %s\n", clean_type_id(intrinsic_type_info.name()).c_str(), source_file_line_from_sloc.c_str()); ```

* Properly visit self in >=3.9 traverse * Add comment about 3.9 behavior

updates: - [github.com/asottile/pyupgrade: v2.34.0 → v2.37.1](asottile/pyupgrade@v2.34.0...v2.37.1) - [github.com/hadialqattan/pycln: v1.3.5 → v2.0.1](hadialqattan/pycln@v1.3.5...v2.0.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Signed-off-by: Henry Schreiner <[email protected]>

* docs: try using Furo * docs: darker output * docs: improve logo for dark background Signed-off-by: Henry Schreiner <[email protected]>

* optimize casting of sparse Eigen arrays * move array * Revert for safety

@Skylion007

* Disable implicit conversion from `0` to `pybind11::handle`. * Reverse or-ed condition in an attempt to resolve GCC 8.3.0 errors (i386/debian:buster). * Trying the simpler `std::is_same<T, PyObject *>` * Add implicit_conversion_from_pytorch_THPObjectPtr_to_handle test. * Accommodate types with implicit conversions to `PyObject *`, other than `handle` & `handle` subclasses, or integral types. * Fix copy-paste mishap (picked wrong name). * Revamp SFINAE construct to actually fix the pytorch issue (already validated against pytorch proper). The first version of the reduced pytorch code was critically missing the move ctor. The first version of the accompanying test was meaningless. Note: It turns out the `!std::is_arithmetic<T>` condition is not needed: `int` is not in general implicitly convertible to `PyObject *`, only the literal `0` is. * Use `NOLINT(performance-noexcept-move-constructor)` for reduced code from the wild (rather than changing the code). * Use any_of, all_of, negation. It turns out to clang-format nicer. * Clean up comments for changed code. * Reduce pytorch situation further, add test for operator ... const. * Use `none_of` as suggested by @Skylion007 * Add `pure_compile_tests_for_handle_from_PyObject_pointers()` * Fix inconsequential oversight (retested). * Factor our `is_pyobj_ptr_or_nullptr_t` to make the SFINAE conditions more readable. * Remove stray line (oversight). * Make the `pure_compile_tests_for_handle_from_PyObject_pointers()` "rhs-const-complete", too. * Remove the temporary PYBIND11_UNDO_PR4008 `#ifdef`.

# Conflicts: # include/pybind11/cast.h # include/pybind11/detail/common.h # include/pybind11/detail/internals.h # include/pybind11/detail/type_caster_base.h # include/pybind11/eigen.h # include/pybind11/numpy.h # include/pybind11/pybind11.h # include/pybind11/pytypes.h # tests/test_builtin_casters.cpp # tests/test_eigen.cpp # tests/test_multiple_inheritance.cpp

v2.10.0 release

# Conflicts: # .github/workflows/ci.yml # .github/workflows/pip.yml # tests/test_class.cpp # tests/test_class.py

# Conflicts: # include/pybind11/eigen/matrix.h

v2.11.1 release

jwnimmer-tri

Reviewable status: 0 of 217 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI)

a discussion (no related file):
Bumping the version is good. For Drake review, we don't need to review the patches pulled in from upstream but we do need to review anything manually that you did -- merge conflicts, bug fixes, additional adjustments, etc.

How do I obtain the inventory of those diff(s) to start my review?

EricCousineau-TRI · 2023-10-17T22:26:52Z

I had done multiple merges. I am not sure if this is the best way, but I can see my PR commits as so:

gitk --first-parent robotlocomotion/drake..HEAD

For most merge commits, the resolutions can be seen as bold black, with the separate parents shown in red and blue (see image below)

However, gitk seems to be unable to show conflict resolutions for certain merges (f5a414c, 098786d).
It could be that I used "unorthodox" ways to resolve the conflicts - I had tried to merge a few times, and had to replay. In some cases, I may have ruined them by using something like

git reset HEAD; git checkout --no-overlay <other-commit-with-resolved-worktree> -- :/

(I was hoping git would "just figure out" the conflicts magically based on the staged worktree at the end)

Is this at all useful, or should I approach this in a different way?

gitk example

jwnimmer-tri

Reviewable status: 0 of 217 files reviewed, 1 unresolved discussion

a discussion (no related file):

Is this at all useful, or should I approach this in a different way?

I'll give it a try.

jwnimmer-tri · 2023-10-24T19:36:50Z

This is completely impossible to review. I tried looking at the merge commits, but they keep overwriting each other. So then I tried comparing the drake-specific overall diff beween this PR and v2.11 to the head of RL/pybind11 drake branch with its upstream merge base, and that's impossible too.

So our only options are to YOLO it, or to never touch it again (throw it all away).

It seems like you're on the YOLO train, so I guess we can do that. Hopefully you will be on deck to fix any bug reports that arise from this upgrade.

rubber stamp.

jwnimmer-tri · 2023-11-02T00:40:00Z

In case I wasn't clear, I think we might as well just merge this and move on.

EricCousineau-TRI · 2023-11-02T14:49:40Z

aye, YOLO works for me!

Skylion007 and others added 30 commits June 1, 2022 15:19

remove useless ctor (pybind#3989)

42a41bf

enable two new clang-tidy checks (pybind#3988)

554c045

* enable two new clang-tidy checks * Use better loop var for char

Make dtype::num() return type consistent with other functions (pybind…

918892b

…#3995)

chore: optimize dictionary access in strip_padding numpy (pybind#3994)

e2dcd95

* emplace field descriptors * reserve sufficient capacity * remove std::move * properly iterate through dict * make handle casting more explicit * Revert to old dict api

[pre-commit.ci] pre-commit autoupdate (pybind#4003)

21f0e72

Add a missing std::move in numpy.h (pybind#4005)

0964a90

ci: use almalinux instead of centos, add 9 (pybind#4020)

c3e9173

Signed-off-by: Henry Schreiner <[email protected]>

[pre-commit.ci] pre-commit autoupdate (pybind#4030)

dd3bf7f

updates: - [github.com/hadialqattan/pycln: v1.3.3 → v1.3.5](hadialqattan/pycln@v1.3.3...v1.3.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

[docs] Fix "Enumerations and internal types" example (pybind#4034)

374a5b0

* Fix binding of `Pet::Attributes` * omit `attributes` as it's not needed Signed-off-by: Masaki Kozuki <[email protected]>

chore: simpler dependabot (pybind#4035)

5a3a1e3

Ignores no longer needed after April 2022. Dependabot keeps the same style pinning now.

docs: update changelog (pybind#4042)

0ab1fcf

Signed-off-by: Henry Schreiner <[email protected]>

PYBIND11_NAMESPACE consistency fixes. (pybind#4043)

cd08869

Report C++ Info: via pytest_report_header() (pybind#4046)

85bc088

* Report `C++ Info:` from `pytest_configure()` * Use pytest_report_header() as suggested by @Skylion007

Properly visit self in >=3.9 traverse (pybind#4051)

f9f0049

* Properly visit self in >=3.9 traverse * Add comment about 3.9 behavior

Undo accidental one-line change under PR pybind#3913 (pybind#4060)

023b3f3

chore: bump clang-tidy to 13 (pybind#3997)

7c3a031

Signed-off-by: Henry Schreiner <[email protected]>

docs: use Furo (pybind#3109)

6b60d97

* docs: try using Furo * docs: darker output * docs: improve logo for dark background Signed-off-by: Henry Schreiner <[email protected]>

chore: optimize sparse matrix casting with python tuple (pybind#4064)

bc9315f

* optimize casting of sparse Eigen arrays * move array * Revert for safety

EricCousineau-TRI added 16 commits October 12, 2023 18:37

run re-format

7f05a75

re-run pre-commit

91e209b

Merge tag 'v2.10.0' into feature-bump-merge-curated

6d93f7a

v2.10.0 release

huh, missed carrying this one over - oops!

111af7c

partial revert to proper form of 8adef2c

6b3378e

Restore files lost in replay

9ad3610

configure: Disable windows and cmake 3.4 testing

cc9fb57

fix ci syntax err

e61bb56

Merge commit 'fab1eebe2c4c~' into feature-bump-merge-curated-moar

7d1fc18

# Conflicts: # .github/workflows/ci.yml # .github/workflows/pip.yml # tests/test_class.cpp # tests/test_class.py

Prep fork for effective rename

432c941

Merge commit 'fab1eebe2c4c' into feature-bump-merge-curated-moar

098786d

# Conflicts: # include/pybind11/eigen/matrix.h

Merge tag 'v2.11.1' into feature-bump-merge-curated-moar

c24c4e4

v2.11.1 release

oops forgot to keep this

44b38a5

fix latent err

8edb237

fix ci syntax err

f35d257

EricCousineau-TRI changed the title ~~[WIP] Merge in more future versions...~~ Merge 'upstream/master' (v2.11.1, 8a099e44b) Oct 12, 2023

EricCousineau-TRI mentioned this pull request Oct 13, 2023

[workspace] Bump pybind11 fork to latest commit (merge w/ upstream v2.11.1) RobotLocomotion/drake#20362

Merged

only check ref_count for temporary values

22186cc

EricCousineau-TRI mentioned this pull request Oct 17, 2023

Merge 'upstream/master' (v2.10.0, aa304c9c) #63

Closed

fixup! no if constexpr please

d280f26

jwnimmer-tri reviewed Oct 17, 2023

View reviewed changes

jwnimmer-tri self-assigned this Oct 17, 2023

jwnimmer-tri marked this pull request as ready for review October 17, 2023 21:34

jwnimmer-tri reviewed Oct 19, 2023

View reviewed changes

EricCousineau-TRI merged commit 5ffbae2 into RobotLocomotion:drake Nov 2, 2023
30 of 32 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 'upstream/master' (v2.11.1, 8a099e44b) #64

Merge 'upstream/master' (v2.11.1, 8a099e44b) #64

EricCousineau-TRI commented Oct 12, 2023 •

edited by jwnimmer-tri

Loading

jwnimmer-tri left a comment

EricCousineau-TRI commented Oct 17, 2023 •

edited

Loading

jwnimmer-tri left a comment

jwnimmer-tri commented Oct 24, 2023 •

edited by EricCousineau-TRI

Loading

jwnimmer-tri commented Nov 2, 2023

EricCousineau-TRI commented Nov 2, 2023

Merge 'upstream/master' (v2.11.1, 8a099e44b) #64

Merge 'upstream/master' (v2.11.1, 8a099e44b) #64

Conversation

EricCousineau-TRI commented Oct 12, 2023 • edited by jwnimmer-tri Loading

jwnimmer-tri left a comment

Choose a reason for hiding this comment

EricCousineau-TRI commented Oct 17, 2023 • edited Loading

jwnimmer-tri left a comment

Choose a reason for hiding this comment

jwnimmer-tri commented Oct 24, 2023 • edited by EricCousineau-TRI Loading

jwnimmer-tri commented Nov 2, 2023

EricCousineau-TRI commented Nov 2, 2023

EricCousineau-TRI commented Oct 12, 2023 •

edited by jwnimmer-tri

Loading

EricCousineau-TRI commented Oct 17, 2023 •

edited

Loading

jwnimmer-tri commented Oct 24, 2023 •

edited by EricCousineau-TRI

Loading