Merge branch 'master' into mannix/test/animal_cat_tiger

rwgk · rwgk · commit 9cefe93dae29 · 2025-09-01T22:23:44.000-07:00
diff --git a/.github/workflows/tests-cibw.yml b/.github/workflows/tests-cibw.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [macos-latest, macos-13]
+        runs-on: [macos-14, macos-13]
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/docs/advanced/pycpp/numpy.rst b/docs/advanced/pycpp/numpy.rst
@@ -88,7 +88,7 @@ buffer objects (e.g. a NumPy matrix).
             py::buffer_info info = b.request();
 
             /* Some basic validation checks ... */
-            if (info.format != py::format_descriptor<Scalar>::format())
+            if (!info.item_type_is_equivalent_to<Scalar>())
                 throw std::runtime_error("Incompatible format: expected a double array!");
 
             if (info.ndim != 2)
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -12,6 +12,92 @@ versioning](http://semver.org) policy.
 Changes will be added here periodically from the "Suggested changelog
 entry" block in pull request descriptions.
 
+
+## Version 3.0.1 (August 22, 2025)
+
+Bug fixes:
+
+- Fixed compilation error in `type_caster_enum_type` when casting
+  pointer-to-enum types. Added pointer overload to handle dereferencing before
+  enum conversion.
+  [#5776](https://github.com/pybind/pybind11/pull/5776)
+
+- Implement binary version of `make_index_sequence` to reduce template depth
+  requirements for functions with many parameters.
+  [#5751](https://github.com/pybind/pybind11/pull/5751)
+
+- Subinterpreter-specific exception handling code was removed to resolve segfaults.
+  [#5795](https://github.com/pybind/pybind11/pull/5795)
+
+- Fixed issue that caused ``PYBIND11_MODULE`` code to run again if the module
+  was re-imported after being deleted from ``sys.modules``.
+  [#5782](https://github.com/pybind/pybind11/pull/5782)
+
+- Prevent concurrent creation of sub-interpreters as a workaround for stdlib
+  concurrency issues in Python 3.12.
+  [#5779](https://github.com/pybind/pybind11/pull/5779)
+
+- Fixed potential crash when using `cpp_function` objects with sub-interpreters.
+  [#5771](https://github.com/pybind/pybind11/pull/5771)
+
+- Fixed non-entrant check in `implicitly_convertible()`.
+  [#5777](https://github.com/pybind/pybind11/pull/5777)
+
+- Support C++20 on platforms that have older c++ runtimes.
+  [#5761](https://github.com/pybind/pybind11/pull/5761)
+
+- Fix compilation with clang on msys2.
+  [#5757](https://github.com/pybind/pybind11/pull/5757)
+
+- Avoid `nullptr` dereference warning with GCC 13.3.0 and python 3.11.13.
+  [#5756](https://github.com/pybind/pybind11/pull/5756)
+
+- Fix potential warning about number of threads being too large.
+  [#5807](https://github.com/pybind/pybind11/pull/5807)
+
+
+<!-- fix(cmake) -->
+
+- Fix gcc 11.4+ warning about serial compilation using CMake.
+  [#5791](https://github.com/pybind/pybind11/pull/5791)
+
+
+Documentation:
+
+- Improve `buffer_info` type checking in numpy docs.
+  [#5805](https://github.com/pybind/pybind11/pull/5805)
+
+- Replace `robotpy-build` with `semiwrap` in the binding tool list.
+  [#5804](https://github.com/pybind/pybind11/pull/5804)
+
+- Show nogil in most examples.
+  [#5770](https://github.com/pybind/pybind11/pull/5770)
+
+- Fix `py::trampoline_self_life_support` visibility in docs.
+  [#5766](https://github.com/pybind/pybind11/pull/5766)
+
+
+Tests:
+
+- Avoid a spurious warning about `DOWNLOAD_CATCH` being manually specified.
+  [#5803](https://github.com/pybind/pybind11/pull/5803)
+
+- Fix an IsolatedConfig test.
+  [#5768](https://github.com/pybind/pybind11/pull/5768)
+
+
+CI:
+
+- Add CI testing for Android.
+  [#5714](https://github.com/pybind/pybind11/pull/5714)
+
+
+Internal:
+
+- Rename internal variables to avoid the word `slots` (reads better).
+  [#5793](https://github.com/pybind/pybind11/pull/5793)
+
+
 ## Version 3.0.0 (July 10, 2025)
 
 Pybind11 3.0 includes an ABI bump, the first required bump in many years
diff --git a/docs/compiling.rst b/docs/compiling.rst
@@ -712,12 +712,15 @@ classes or incorporating modern meta-programming constructs.
 
 .. [AutoWIG] https://github.com/StatisKit/AutoWIG
 
-[robotpy-build]_ is a is a pure python, cross platform build tool that aims to
-simplify creation of python wheels for pybind11 projects, and provide
-cross-project dependency management. Additionally, it is able to autogenerate
-customizable pybind11-based wrappers by parsing C++ header files.
-
-.. [robotpy-build] https://robotpy-build.readthedocs.io
+[semiwrap]_ is a build tool that makes it simpler to wrap C/C++ libraries with
+pybind11 by automating large portions of the wrapping process and handling some
+of the more complex aspects of creating pybind11 based wrappers (especially with
+trampolines to allow inheriting from C++ classes from Python). It includes a
+hatchling plugin that autogenerates meson.build files that can be built using
+meson, and those build files parse your wrapped headers and generate/compile
+pybind11 based wrappers into python extension modules.
+
+.. [semiwrap] https://semiwrap.readthedocs.io
 
 [litgen]_ is an automatic python bindings generator with a focus on generating
 documented and discoverable bindings: bindings will nicely reproduce the documentation
diff --git a/docs/installing.rst b/docs/installing.rst
@@ -87,7 +87,7 @@ Global install with brew
 
 The brew package manager (Homebrew on macOS, or Linuxbrew on Linux) has a
 `pybind11 package
-<https://github.com/Homebrew/homebrew-core/blob/master/Formula/pybind11.rb>`_.
+<https://github.com/Homebrew/homebrew-core/blob/master/Formula/p/pybind11.rb>`_.
 To install:
 
 .. code-block:: bash
diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h
@@ -19,15 +19,15 @@
 /* -- start version constants -- */
 #define PYBIND11_VERSION_MAJOR 3
 #define PYBIND11_VERSION_MINOR 0
-#define PYBIND11_VERSION_MICRO 1
+#define PYBIND11_VERSION_MICRO 2
 // ALPHA = 0xA, BETA = 0xB, GAMMA = 0xC (release candidate), FINAL = 0xF (stable release)
 // - The release level is set to "alpha" for development versions.
 //   Use 0xA0 (LEVEL=0xA, SERIAL=0) for development versions.
 // - For stable releases, set the serial to 0.
 #define PYBIND11_VERSION_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
 #define PYBIND11_VERSION_RELEASE_SERIAL 0
 // String version of (micro, release level, release serial), e.g.: 0a0, 0b1, 0rc1, 0
-#define PYBIND11_VERSION_PATCH 1a0
+#define PYBIND11_VERSION_PATCH 2a0
 /* -- end version constants -- */
 
 #if !defined(Py_PACK_FULL_VERSION)
@@ -436,14 +436,14 @@ PyModuleDef_Init should be treated like any other PyObject (so not shared across
         PYBIND11_CHECK_PYTHON_VERSION                                                             \
         pre_init;                                                                                 \
         PYBIND11_ENSURE_INTERNALS_READY                                                           \
-        static ::pybind11::detail::slots_array slots = ::pybind11::detail::init_slots(            \
+        static ::pybind11::detail::slots_array mod_def_slots = ::pybind11::detail::init_slots(    \
             &PYBIND11_CONCAT(pybind11_exec_, name), ##__VA_ARGS__);                               \
         static PyModuleDef def{/* m_base */ PyModuleDef_HEAD_INIT,                                \
                                /* m_name */ PYBIND11_TOSTRING(name),                              \
                                /* m_doc */ nullptr,                                               \
                                /* m_size */ 0,                                                    \
                                /* m_methods */ nullptr,                                           \
-                               /* m_slots */ slots.data(),                                        \
+                               /* m_slots */ mod_def_slots.data(),                                \
                                /* m_traverse */ nullptr,                                          \
                                /* m_clear */ nullptr,                                             \
                                /* m_free */ nullptr};                                             \
diff --git a/include/pybind11/detail/internals.h b/include/pybind11/detail/internals.h
@@ -18,7 +18,9 @@
 #include "struct_smart_holder.h"
 
 #include <atomic>
+#include <cstdint>
 #include <exception>
+#include <limits>
 #include <mutex>
 #include <thread>
 
@@ -274,8 +276,10 @@ struct internals {
         registered_exception_translators.push_front(&translate_exception);
 #ifdef Py_GIL_DISABLED
         // Scale proportional to the number of cores. 2x is a heuristic to reduce contention.
-        auto num_shards
-            = static_cast<size_t>(round_up_to_next_pow2(2 * std::thread::hardware_concurrency()));
+        // Make sure the number isn't unreasonable by limiting it to 16 bits (65K)
+        auto num_shards = static_cast<std::uint16_t>(
+            std::min<std::size_t>(round_up_to_next_pow2(2 * std::thread::hardware_concurrency()),
+                                  std::numeric_limits<std::uint16_t>::max()));
         if (num_shards == 0) {
             num_shards = 1;
         }
diff --git a/include/pybind11/detail/pybind11_namespace_macros.h b/include/pybind11/detail/pybind11_namespace_macros.h
@@ -16,12 +16,7 @@
 // possible using these macros. Please also be sure to push/pop with the pybind11 macros. Please
 // only use compiler specifics if you need to check specific versions, e.g. Apple Clang vs. vanilla
 // Clang.
-#if defined(_MSC_VER)
-#    define PYBIND11_COMPILER_MSVC
-#    define PYBIND11_PRAGMA(...) __pragma(__VA_ARGS__)
-#    define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(warning(push))
-#    define PYBIND11_WARNING_POP PYBIND11_PRAGMA(warning(pop))
-#elif defined(__INTEL_COMPILER)
+#if defined(__INTEL_COMPILER)
 #    define PYBIND11_COMPILER_INTEL
 #    define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
 #    define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(warning push)
@@ -36,6 +31,11 @@
 #    define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
 #    define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(GCC diagnostic push)
 #    define PYBIND11_WARNING_POP PYBIND11_PRAGMA(GCC diagnostic pop)
+#elif defined(_MSC_VER) // Must be after the clang branch because clang-cl also defines _MSC_VER
+#    define PYBIND11_COMPILER_MSVC
+#    define PYBIND11_PRAGMA(...) __pragma(__VA_ARGS__)
+#    define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(warning(push))
+#    define PYBIND11_WARNING_POP PYBIND11_PRAGMA(warning(pop))
 #endif
 
 #ifdef PYBIND11_COMPILER_MSVC
diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
@@ -1388,29 +1388,29 @@ template <typename... Options>
 inline slots_array init_slots(int (*exec_fn)(PyObject *), Options &&...options) noexcept {
     /* NOTE: slots_array MUST be large enough to hold all possible options.  If you add an option
     here, you MUST also increase the size of slots_array in the type alias above! */
-    slots_array slots;
+    slots_array mod_def_slots;
     size_t next_slot = 0;
 
-    slots[next_slot++] = {Py_mod_create, reinterpret_cast<void *>(&cached_create_module)};
+    mod_def_slots[next_slot++] = {Py_mod_create, reinterpret_cast<void *>(&cached_create_module)};
 
     if (exec_fn != nullptr) {
-        slots[next_slot++] = {Py_mod_exec, reinterpret_cast<void *>(exec_fn)};
+        mod_def_slots[next_slot++] = {Py_mod_exec, reinterpret_cast<void *>(exec_fn)};
     }
 
 #ifdef Py_mod_multiple_interpreters
-    slots[next_slot++] = {Py_mod_multiple_interpreters, multi_interp_slot(options...)};
+    mod_def_slots[next_slot++] = {Py_mod_multiple_interpreters, multi_interp_slot(options...)};
 #endif
 
     if (gil_not_used_option(options...)) {
 #if defined(Py_mod_gil) && defined(Py_GIL_DISABLED)
-        slots[next_slot++] = {Py_mod_gil, Py_MOD_GIL_NOT_USED};
+        mod_def_slots[next_slot++] = {Py_mod_gil, Py_MOD_GIL_NOT_USED};
 #endif
     }
 
     // slots must have a zero end sentinel
-    slots[next_slot++] = {0, nullptr};
+    mod_def_slots[next_slot++] = {0, nullptr};
 
-    return slots;
+    return mod_def_slots;
 }
 
 PYBIND11_NAMESPACE_END(detail)
diff --git a/include/pybind11/stl/filesystem.h b/include/pybind11/stl/filesystem.h
@@ -17,7 +17,7 @@
 #elif defined(PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM)
 #    include <experimental/filesystem>
 #else
-#    error "Neither #include <filesystem> nor #include <experimental/filesystem is available."
+#    error "Neither #include <filesystem> nor #include <experimental/filesystem> is available."
 #endif
 
 PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
diff --git a/include/pybind11/subinterpreter.h b/include/pybind11/subinterpreter.h
@@ -280,28 +280,6 @@ inline subinterpreter_scoped_activate::~subinterpreter_scoped_activate() {
         // We were on this interpreter already, so just make sure the GIL goes back as it was
         PyGILState_Release(gil_state_);
     } else {
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-        bool has_active_exception;
-#    if defined(__cpp_lib_uncaught_exceptions)
-        has_active_exception = std::uncaught_exceptions() > 0;
-#    else
-        // removed in C++20, replaced with uncaught_exceptions
-        has_active_exception = std::uncaught_exception();
-#    endif
-        if (has_active_exception) {
-            try {
-                std::rethrow_exception(std::current_exception());
-            } catch (error_already_set &) {
-                // Because error_already_set holds python objects and what() acquires the GIL, it
-                // is basically never OK to let these exceptions propagate outside the current
-                // active interpreter.
-                pybind11_fail("~subinterpreter_scoped_activate: cannot propagate Python "
-                              "exceptions outside of their owning interpreter");
-            } catch (...) {
-            }
-        }
-#endif
-
         if (tstate_) {
 #if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
             if (detail::get_thread_state_unchecked() != tstate_) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -67,6 +67,7 @@ project(pybind11_tests CXX)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../tools")
 
 option(PYBIND11_WERROR "Report all warnings as errors" OFF)
+option(DOWNLOAD_CATCH "Download catch2 if not found" OFF)
 option(DOWNLOAD_EIGEN "Download EIGEN" OFF)
 option(PYBIND11_CUDA_TESTS "Enable building CUDA tests" OFF)
 option(PYBIND11_TEST_SMART_HOLDER "Change the default to smart holder" OFF)
diff --git a/tools/FindCatch.cmake b/tools/FindCatch.cmake
@@ -9,8 +9,6 @@
 #  CATCH_INCLUDE_DIR      - path to catch.hpp
 #  CATCH_VERSION          - version number
 
-option(DOWNLOAD_CATCH "Download catch2 if not found")
-
 if(NOT Catch_FIND_VERSION)
   message(FATAL_ERROR "A version number must be specified.")
 elseif(Catch_FIND_REQUIRED)
diff --git a/tools/make_changelog.py b/tools/make_changelog.py
@@ -65,12 +65,18 @@
         continue
 
     msg = changelog.group("content").strip()
+    if not msg:
+        missing.append(issue)
+        continue
     if msg.startswith("* "):
         msg = msg[2:]
     if not msg.startswith("- "):
         msg = "- " + msg
     if not msg.endswith("."):
         msg += "."
+    if msg == "- Placeholder.":
+        missing.append(issue)
+        continue
 
     msg += f"\n  [#{issue.number}]({issue.html_url})"
     for cat, cat_list in cats.items():
