Merge remote-tracking branch 'origin/master' into henryiii/ci/android

Author: mhsmith

.github/workflows/ci.yml

@@ -136,7 +136,7 @@ jobs:
             python-version: '3.10'
             cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON -DCMAKE_CXX_FLAGS="/GR /EHsc"
           - runs-on: windows-2022
-            python-version: '3.13.3'
+            python-version: '3.13'
             cmake-args: -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL
           - runs-on: windows-latest
             python-version: '3.13t'
@@ -850,7 +850,7 @@ jobs:
             args: -DCMAKE_CXX_STANDARD=17
           - python: '3.10'
             args: -DCMAKE_CXX_STANDARD=20
-          - python: '3.13.3'
+          - python: '3.13'
 
 
     name: "🐍 ${{ matrix.python }} • MSVC 2022 • x86 ${{ matrix.args }}"
@@ -864,6 +864,9 @@ jobs:
       with:
         python-version: ${{ matrix.python }}
         architecture: x86
+        # Python 3.13.4 broken on Windows
+        check-latest: >-
+          ${{ matrix.python == '3.13' && runner.os == 'Windows' }}
 
     - name: Update CMake
       uses: jwlawson/actions-setup-cmake@v2.0

.github/workflows/reusable-standard.yml

@@ -37,6 +37,9 @@ jobs:
         with:
           python-version: ${{ inputs.python-version }}
           allow-prereleases: true
+          # Python 3.13.4 broken on Windows
+          check-latest: >-
+            ${{ inputs.python-version == '3.13' && runner.os == 'Windows' }}
 
       - name: Setup Boost (Linux)
         if: runner.os == 'Linux'

.pre-commit-config.yaml

@@ -25,22 +25,22 @@ repos:
 
 # Clang format the codebase automatically
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: "v20.1.5"
+  rev: "v20.1.7"
   hooks:
   - id: clang-format
     types_or: [c++, c, cuda]
 
 # Ruff, the Python auto-correcting linter/formatter written in Rust
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.12
+  rev: v0.12.2
   hooks:
-  - id: ruff
+  - id: ruff-check
     args: ["--fix", "--show-fixes"]
   - id: ruff-format
 
 # Check static types with mypy
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: "v1.16.0"
+  rev: "v1.16.1"
   hooks:
   - id: mypy
     args: []
@@ -142,7 +142,7 @@ repos:
 
 # Check schemas on some of our YAML files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.33.0
+  rev: 0.33.2
   hooks:
   - id: check-readthedocs
   - id: check-github-workflows

README.rst

@@ -3,7 +3,9 @@
 
 **pybind11 (v3)  — Seamless interoperability between C++ and Python**
 
-|Latest Documentation Status| |Stable Documentation Status| |Gitter chat| |GitHub Discussions| |CI| |Build status|
+|Latest Documentation Status| |Stable Documentation Status| |Gitter chat| |GitHub Discussions|
+
+|CI| |Build status| |SPEC 4 — Using and Creating Nightly Wheels|
 
 |Repology| |PyPI package| |Conda-forge| |Python Versions|
 
@@ -210,3 +212,5 @@ to the terms and conditions of this license.
    :target: https://pypi.org/project/pybind11/
 .. |GitHub Discussions| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
    :target: https://github.com/pybind/pybind11/discussions
+.. |SPEC 4 — Using and Creating Nightly Wheels| image:: https://img.shields.io/badge/SPEC-4-green?labelColor=%23004811&color=%235CA038
+   :target: https://scientific-python.org/specs/spec-0004/

docs/advanced/pycpp/numpy.rst

@@ -232,6 +232,46 @@ prevent many types of unsupported structures, it is still the user's
 responsibility to use only "plain" structures that can be safely manipulated as
 raw memory without violating invariants.
 
+Scalar types
+============
+
+In some cases we may want to accept or return NumPy scalar values such as
+``np.float32`` or ``np.float64``. We hope to be able to handle single-precision
+and double-precision on the C-side. However, both are bound to Python's
+double-precision builtin float by default, so they cannot be processed separately.
+We used the ``py::buffer`` trick to implement the previous approach, which
+will cause the readability of the code to drop significantly.
+
+Luckily, there's a helper type for this occasion - ``py::numpy_scalar``:
+
+.. code-block:: cpp
+
+    m.def("add", [](py::numpy_scalar<float> a, py::numpy_scalar<float> b) {
+        return py::make_scalar(a + b);
+    });
+    m.def("add", [](py::numpy_scalar<double> a, py::numpy_scalar<double> b) {
+        return py::make_scalar(a + b);
+    });
+
+This type is trivially convertible to and from the type it wraps; currently
+supported scalar types are NumPy arithmetic types: ``bool_``, ``int8``,
+``int16``, ``int32``, ``int64``, ``uint8``, ``uint16``, ``uint32``,
+``uint64``, ``float32``, ``float64``, ``complex64``, ``complex128``, all of
+them mapping to respective C++ counterparts.
+
+.. note::
+
+    ``py::numpy_scalar<T>`` strictly matches NumPy scalar types. For example,
+    ``py::numpy_scalar<int64_t>`` will accept ``np.int64(123)``,
+    but **not** a regular Python ``int`` like ``123``.
+
+.. note::
+
+    Native C types are mapped to NumPy types in a platform specific way: for
+    instance, ``char`` may be mapped to either ``np.int8`` or ``np.uint8``
+    and ``long`` may use 4 or 8 bytes depending on the platform. Unless you
+    clearly understand the difference and your needs, please use ``<cstdint>``.
+
 Vectorizing functions
 =====================
 

docs/changelog.md

@@ -12,13 +12,7 @@ versioning](http://semver.org) policy.
 Changes will be added here periodically from the "Suggested changelog
 entry" block in pull request descriptions.
 
-## 3.0.0 (RC 3) (June 4, 2025)
-
-Since this is a large release, we are providing a release candidate to give
-projects time to test! We also now provide
-[SPEC 4](https://scientific-python.org/specs/spec-0004/) nightly wheels. We
-are hoping to split up `std.h`; that work is approved to be added during the
-RC phase if it's ready in time. We expect the RC phase to last around a week.
+## Version 3.0.0 (July 10, 2025)
 
 Pybind11 3.0 includes an ABI bump, the first required bump in many years
 on Unix (Windows has had required bumps more often). This release contains
@@ -42,6 +36,18 @@ New Features:
   trampoline objects, and `std::enable_shared_from_this`.
   [#5542](https://github.com/pybind/pybind11/pull/5542)
 
+  - Added support for `std::shared_ptr<const T>` in `py::init()` when using
+    `py::smart_holder`, complementing existing support for
+    `std::unique_ptr<const T>`.
+    [#5731](https://github.com/pybind/pybind11/pull/5731)
+
+  - Support const-only smart pointers.
+    [#5718](https://github.com/pybind/pybind11/pull/5718)
+
+  - Eliminate cross-DSO RTTI reliance from `trampoline_self_life_support` functionality, `smart_holder` deleter detection, and other
+    `smart_holder` bookkeeping. Resolves platform-specific issues on macOS related to cross-DSO `dynamic_cast` and `typeid` mismatches.
+    [#5728](https://github.com/pybind/pybind11/pull/5728) (replaces [#5700](https://github.com/pybind/pybind11/pull/5700))
+
 - Changed `PYBIND11_MODULE` macro implementation to perform multi-phase
   module initialization (PEP 489) behind the scenes.
   [#5574](https://github.com/pybind/pybind11/pull/5574) and avoid destruction
@@ -64,6 +70,9 @@ New Features:
   - Modify internals pointer-to-pointer implementation to not use `thread_local` (better iOS support).
     [#5709](https://github.com/pybind/pybind11/pull/5709)
 
+  - Support implementations without subinterpreter support.
+    [#5732](https://github.com/pybind/pybind11/pull/5732)
+
 - Changed `PYBIND11_EMBEDDED_MODULE` macro implementation to perform
   multi-phase module initialization (PEP 489) behind the scenes and to
   support `py::mod_gil_not_used()`,
@@ -85,6 +94,9 @@ New Features:
   - Fix signature for functions with a `native_enum` in the signature.
     [#5619](https://github.com/pybind/pybind11/pull/5619)
 
+- Support `py::numpy_scalar<>` / `py::make_scalar()` for NumPy types.
+  [#5726](https://github.com/pybind/pybind11/pull/5726)
+
 - A `py::release_gil_before_calling_cpp_dtor` option (for `py::class_`)
   was added to resolve the long-standing issue \#1446.
   [#5522](https://github.com/pybind/pybind11/pull/5522)
@@ -111,8 +123,10 @@ New Features:
 
 - `pybind11/conduit/pybind11_platform_abi_id.h` was factored out, to
   maximize reusability of `PYBIND11_PLATFORM_ABI_ID` (for other
-  Python/C++ binding systems).
-  [#5375](https://github.com/pybind/pybind11/pull/5375)
+  Python/C++ binding systems). Separately, a note was added to explain
+  that the conduit feature only covers from-Python-to-C++ conversions.
+  [#5375](https://github.com/pybind/pybind11/pull/5375) \|
+  [#5740](https://github.com/pybind/pybind11/pull/5740)
 
 - Added support for finding pybind11 using pkgconf distributed on pypi.
   [#5552](https://github.com/pybind/pybind11/pull/5552)
@@ -124,7 +138,7 @@ New Features:
   update example for `pybind11::custom_type_setup` in documentation.
   [#5669](https://github.com/pybind/pybind11/pull/5669)
 
-* Added `py::scoped_critical_section` to support free-threaded mode.
+- Added `py::scoped_critical_section` to support free-threaded mode.
   [#5684](https://github.com/pybind/pybind11/pull/5684) \|
   [#5706](https://github.com/pybind/pybind11/pull/5706)
 
@@ -216,12 +230,6 @@ Bug fixes:
   [#5381](https://github.com/pybind/pybind11/pull/5381)
 - Disable false-positive GCC 12 Bound Check warning.
   [#5355](https://github.com/pybind/pybind11/pull/5355)
-- fix: using `__cpp_nontype_template_args` instead of
-  `__cpp_nontype_template_parameter_class`.
-  [#5330](https://github.com/pybind/pybind11/pull/5330)
-- Properly translate C++ exception to Python exception when creating
-  Python buffer from wrapped object.
-  [#5324](https://github.com/pybind/pybind11/pull/5324)
 - Update the dict when restoring pickles, instead of assigning a
   replacement dict.
   [#5658](https://github.com/pybind/pybind11/pull/5658)
@@ -232,8 +240,6 @@ Bug fixes:
 - Change the behavior of the default constructor of `py::slice` to be
   equivalent to `::` in Python.
   [#5620](https://github.com/pybind/pybind11/pull/5620)
-- Expose required symbol when using clang.
-  [#5700](https://github.com/pybind/pybind11/pull/5700)
 
 Bug fixes and features (CMake):
 
@@ -254,10 +260,9 @@ Bug fixes and features (CMake):
 - Add support for running pybind11's tests via presets in CMake 3.25+.
   [#5655](https://github.com/pybind/pybind11/pull/5655) and support `--fresh`.
   [#5668](https://github.com/pybind/pybind11/pull/5668)
-- Restructure venv support to support `--fresh`, make in build folder.
-  [#5668](https://github.com/pybind/pybind11/pull/5668)
-
-* Presets now generate `compile_commands.json`.
+- Experimental CMake support for Android.
+  [#5733](https://github.com/pybind/pybind11/pull/5733)
+- Presets now generate `compile_commands.json`.
   [#5685](https://github.com/pybind/pybind11/pull/5685)
 
 Bug fixes (free-threading):
@@ -282,7 +287,7 @@ Internals:
   that it can easily be reused.
   [#5614](https://github.com/pybind/pybind11/pull/5614)
 
-* Use CPython macros to construct `PYBIND11_VERSION_HEX`.
+- Use CPython macros to construct `PYBIND11_VERSION_HEX`.
   [#5683](https://github.com/pybind/pybind11/pull/5683)
 
 Documentation:
@@ -293,10 +298,6 @@ Documentation:
 - A new "Double locking, deadlocking, GIL" document was added.
   [#5394](https://github.com/pybind/pybind11/pull/5394)
 
-- Adds an answer (FAQ) for "What is a highly conclusive and simple way
-  to find memory leaks?".
-  [#5340](https://github.com/pybind/pybind11/pull/5340)
-
 - Add documenting for free-threading and subinterpreters.
   [#5659](https://github.com/pybind/pybind11/pull/5659)
 
@@ -309,20 +310,20 @@ Tests:
   compiling using `clang` on Linux with the `-funsigned-char` flag.
   [#5545](https://github.com/pybind/pybind11/pull/5545)
 
-- Test PyPy3.11 in CI.
-  [#5534](https://github.com/pybind/pybind11/pull/5534)
-
 - CI testing now includes
   `-Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls`
   in some jobs.
   [#5523](https://github.com/pybind/pybind11/pull/5523)
 
-* Add nightly wheels to scientific-python's nightly wheelhouse.
+- Add nightly wheels to scientific-python's nightly wheelhouse.
   [#5675](https://github.com/pybind/pybind11/pull/5675)
 
-* Expect free-threaded warning when loading a non-free-threaded module.
+- Expect free-threaded warning when loading a non-free-threaded module.
   [#5680](https://github.com/pybind/pybind11/pull/5680)
 
+- Run pytest under Python devmode.
+  [#5715](https://github.com/pybind/pybind11/pull/5715)
+
 New and removed platforms:
 
 - Support Python 3.14 (beta 1+).
@@ -337,15 +338,18 @@ New and removed platforms:
 
 - Support for PyPy 3.11 added.
   [#5508](https://github.com/pybind/pybind11/pull/5508)
+  And test in ci.
+  [#5534](https://github.com/pybind/pybind11/pull/5534)
 
 - Support for PyPy 3.8 and 3.9 was dropped.
   [#5578](https://github.com/pybind/pybind11/pull/5578)
 
 - Support for Python 3.7 was removed. (Official end-of-life:
-  2023-06-27). [#5191](https://github.com/pybind/pybind11/pull/5191)
+  2023-06-27).
+  [#5191](https://github.com/pybind/pybind11/pull/5191)
 
 - Support for CMake older than 3.15 removed. CMake 3.15-4.0 supported.
-  [#5304](https://github.com/pybind/pybind11/pull/5304) and fix regression [#5688](https://github.com/pybind/pybind11/pull/5688).
+  [#5304](https://github.com/pybind/pybind11/pull/5304) and fix regression [#5691](https://github.com/pybind/pybind11/pull/5691).
 
 - Use scikit-build-core for the build backend for the PyPI `pybind11`.
   The CMake generation has been moved to the sdist-\>wheel step.
@@ -362,7 +366,6 @@ New and removed platforms:
 - Support Windows C++20 and Linux C++23 in tests.
   [#5707](https://github.com/pybind/pybind11/pull/5707)
 
-
 ## Version 2.13.6 (September 13, 2024)
 
 New Features:

docs/release.rst

@@ -50,7 +50,9 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
 - Add a release branch if this is a new MINOR version, or update the existing
   release branch if it is a patch version
 
-  - New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
+  - NOTE: This documentation assumes your ``upstream`` is ``https://github.com/pybind/pybind11.git``
+
+  - New branch: ``git checkout -b vX.Y``, ``git push -u upstream vX.Y``
 
   - Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
 
@@ -63,7 +65,7 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use
 
     - Last-minute consistency check: same as tag?
 
-  - ``git push --tags``
+  - Push the new tag: ``git push upstream vX.Y.Z``
 
 - Update stable
 

docs/requirements.txt

@@ -85,7 +85,7 @@ sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
 sphinxcontrib-svg2pdfconverter==1.2.2
     # via -r requirements.in
-urllib3==2.2.2
+urllib3==2.5.0
     # via requests
 zipp==3.23.0
     # via importlib-metadata

include/pybind11/conduit/pybind11_conduit_v1.h

@@ -6,6 +6,11 @@
 
 * including pybind11 versions with different PYBIND11_INTERNALS_VERSION's.
 
+    * NOTE: The conduit feature
+            only covers    from-Python-to-C++ conversions, it
+            does not cover from-C++-to-Python conversions.
+            (For the latter, a different feature would have to be added.)
+
 The naming of the feature is a bit misleading:
 
 * The feature is in no way tied to pybind11 internals.

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 0
+#define PYBIND11_VERSION_MICRO 1
 // 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_GAMMA
-#define PYBIND11_VERSION_RELEASE_SERIAL 3
+#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 0rc3
+#define PYBIND11_VERSION_PATCH 1a0
 /* -- end version constants -- */
 
 #if !defined(Py_PACK_FULL_VERSION)
@@ -490,7 +490,8 @@ PyModuleDef_Init should be treated like any other PyObject (so not shared across
 
     - ``mod_gil_not_used()``
     - ``multiple_interpreters::per_interpreter_gil()``
-    - ``multiple_interpreters::per_interprshareeter_gil()``
+    - ``multiple_interpreters::shared_gil()``
+    - ``multiple_interpreters::not_supported()``
 
     .. code-block:: cpp