Merge branch 'master' into pep695-generic-docstring

Author: InvincibleRMC

.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/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
@@ -129,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)

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
 

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 4
+#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 0rc4
+#define PYBIND11_VERSION_PATCH 1a0
 /* -- end version constants -- */
 
 #if !defined(Py_PACK_FULL_VERSION)

pyproject.toml

@@ -143,9 +143,6 @@ messages_control.disable = [
   "consider-using-f-string", # triggers in _version.py incorrectly
 ]
 
-[tool.ruff]
-src = ["src"]
-
 [tool.ruff.lint]
 extend-select = [
   "B",           # flake8-bugbear
@@ -166,17 +163,21 @@ extend-select = [
   "YTT",         # flake8-2020
 ]
 ignore = [
-  "PLR",    # Design related pylint
-  "PT011",  # Too broad with raises in pytest
-  "SIM118", # iter(x) is not always the same as iter(x.keys())
+  "PLR",     # Design related pylint
+  "PT011",   # Too broad with raises in pytest
+  "SIM118",  # iter(x) is not always the same as iter(x.keys())
+  "PLC0415", # We import in functions for various reasons
 ]
-unfixable = ["T20"]
 isort.known-first-party = ["env", "pybind11_cross_module_tests", "pybind11_tests"]
 isort.required-imports = ["from __future__ import annotations"]
 
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**" = ["EM", "N", "E721"]
+"tests/**" = [
+  "EM",
+  "N",
+  "E721",
+]
 "tests/test_call_policies.py" = ["PLC1901"]
 
 [tool.repo-review]

tests/conftest.py

@@ -77,6 +77,8 @@ def __init__(self, string):
     def __str__(self):
         return self.string
 
+    __hash__ = None
+
     def __eq__(self, other):
         # Ignore constructor/destructor output which is prefixed with "###"
         a = [
@@ -94,6 +96,8 @@ def __eq__(self, other):
 class Unordered(Output):
     """Custom comparison for output without strict line ordering"""
 
+    __hash__ = None
+
     def __eq__(self, other):
         a = _split_and_sort(self.string)
         b = _split_and_sort(other)
@@ -116,6 +120,8 @@ def __enter__(self):
     def __exit__(self, *args):
         self.out, self.err = self.capfd.readouterr()
 
+    __hash__ = None
+
     def __eq__(self, other):
         a = Output(self.out)
         b = other
@@ -155,6 +161,8 @@ def __call__(self, thing):
         self.string = self.sanitizer(thing)
         return self
 
+    __hash__ = None
+
     def __eq__(self, other):
         a = self.string
         b = _strip_and_dedent(other)

tests/test_class_sh_basic.py

@@ -135,8 +135,9 @@ def test_cannot_disown_use_count_ne_1(pass_f, rtrn_f):
     assert str(exc_info.value) == ("Cannot disown use_count != 1 (load_as_unique_ptr).")
 
 
-def test_unique_ptr_roundtrip(num_round_trips=1000):
+def test_unique_ptr_roundtrip():
     # Multiple roundtrips to stress-test instance registration/deregistration.
+    num_round_trips = 1000
     recycled = m.atyp("passenger")
     for _ in range(num_round_trips):
         id_orig = id(recycled)
@@ -164,8 +165,9 @@ def test_rtrn_unique_ptr_cref():
     assert obj0 is obj1
 
 
-def test_unique_ptr_cref_roundtrip(num_round_trips=1000):
+def test_unique_ptr_cref_roundtrip():
     # Multiple roundtrips to stress-test implementation.
+    num_round_trips = 1000
     orig = m.atyp("passenger")
     mtxt_orig = m.get_mtxt(orig)
     recycled = orig

tests/test_warnings.py

@@ -19,7 +19,7 @@
 def test_warning_simple(
     expected_category, expected_message, expected_value, module_function
 ):
-    with pytest.warns(Warning) as excinfo:
+    with pytest.warns(Warning, match="This is") as excinfo:
         value = module_function()
 
     assert issubclass(excinfo[0].category, expected_category)