Merge branch 'master' into master_with_dummy_change

.github/workflows/ci.yml

@@ -108,12 +108,15 @@ jobs:
  run: python -m pip install pytest-github-actions-annotate-failures
 
  # First build - C++11 mode and inplace
- # More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here.
+ # More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here
+ # (same for PYBIND11_NUMPY_1_ONLY, but requires a NumPy 1.x at runtime).
  - name: Configure C++11 ${{ matrix.args }}
  run: >
  cmake -S . -B .
  -DPYBIND11_WERROR=ON
+ -DPYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION=ON
  -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
+ -DPYBIND11_NUMPY_1_ONLY=ON
  -DDOWNLOAD_CATCH=ON
  -DDOWNLOAD_EIGEN=ON
  -DCMAKE_CXX_STANDARD=11
@@ -138,11 +141,13 @@ jobs:
 
  # Second build - C++17 mode and in a build directory
  # More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF here.
+ # (same for PYBIND11_NUMPY_1_ONLY, but requires a NumPy 1.x at runtime).
  - name: Configure C++17
  run: >
  cmake -S . -B build2
  -DPYBIND11_WERROR=ON
  -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
+ -DPYBIND11_NUMPY_1_ONLY=ON
  -DDOWNLOAD_CATCH=ON
  -DDOWNLOAD_EIGEN=ON
  -DCMAKE_CXX_STANDARD=17
@@ -660,6 +665,11 @@ jobs:
  run: |
  python3 -m pip install cmake -r tests/requirements.txt
 
+ - name: Ensure NumPy 2 is used (required Python >= 3.9)
+ if: matrix.container == 'almalinux:9'
+ run: |
+ python3 -m pip install 'numpy>=2.0.0b1' 'scipy>=1.13.0rc1'
+
  - name: Configure
  shell: bash
  run: >
@@ -895,8 +905,10 @@ jobs:
  python-version: ${{ matrix.python }}
 
  - name: Prepare env
+ # Ensure use of NumPy 2 (via NumPy nightlies but can be changed soon)
  run: |
  python3 -m pip install -r tests/requirements.txt
+ python3 -m pip install 'numpy>=2.0.0b1' 'scipy>=1.13.0rc1'
 
  - name: Update CMake
  uses: jwlawson/actions-setup-cmake@v2.0

.github/workflows/configure.yml

@@ -35,7 +35,7 @@ jobs:
 
  - runs-on: ubuntu-20.04
  arch: x64
- cmake: "3.27"
+ cmake: "3.29"
 
  - runs-on: macos-latest
  arch: x64

.github/workflows/labeler.yml

@@ -14,7 +14,7 @@ jobs:
  pull-requests: write
  steps:
 
- - uses: actions/labeler@main
+ - uses: actions/labeler@v4
  if: >
  github.event.pull_request.merged == true &&
  !startsWith(github.event.pull_request.title, 'chore(deps):') &&

.pre-commit-config.yaml

@@ -25,28 +25,28 @@ repos:
 
 # Clang format the codebase automatically
 - repo: https://github.com/pre-commit/mirrors-clang-format
- rev: "v17.0.6"
+ rev: "v18.1.2"
  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.2.0
+ rev: v0.3.5
  hooks:
  - id: ruff
  args: ["--fix", "--show-fixes"]
  - id: ruff-format
 
 # Check static types with mypy
 - repo: https://github.com/pre-commit/mirrors-mypy
- rev: "v1.8.0"
+ rev: "v1.9.0"
  hooks:
  - id: mypy
  args: []
  exclude: ^(tests|docs)/
  additional_dependencies:
- - markdown-it-py<3 # Drop this together with dropping Python 3.7 support.
+ - markdown-it-py
  - nox
  - rich
  - types-setuptools
@@ -87,13 +87,13 @@ repos:
 
 # Changes tabs to spaces
 - repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: "v1.5.4"
+ rev: "v1.5.5"
  hooks:
  - id: remove-tabs
 
 # Avoid directional quotes
 - repo: https://github.com/sirosen/texthooks
- rev: "0.6.4"
+ rev: "0.6.6"
  hooks:
  - id: fix-ligatures
  - id: fix-smartquotes
@@ -127,7 +127,7 @@ repos:
 
 # Check for common shell mistakes
 - repo: https://github.com/shellcheck-py/shellcheck-py
- rev: "v0.9.0.6"
+ rev: "v0.10.0.1"
  hooks:
  - id: shellcheck
 
@@ -142,13 +142,13 @@ repos:
 
 # PyLint has native support - not always usable, but works for us
 - repo: https://github.com/PyCQA/pylint
- rev: "v3.0.3"
+ rev: "v3.1.0"
  hooks:
  - id: pylint
  files: ^pybind11
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
- rev: 0.28.0
+ rev: 0.28.1
  hooks:
  - id: check-readthedocs
  - id: check-github-workflows

CMakeLists.txt

@@ -12,13 +12,13 @@ endif()
 
 cmake_minimum_required(VERSION 3.5)
 
-# The `cmake_minimum_required(VERSION 3.5...3.27)` syntax does not work with
+# The `cmake_minimum_required(VERSION 3.5...3.29)` syntax does not work with
 # some versions of VS that have a patched CMake 3.11. This forces us to emulate
 # the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.27)
+if(${CMAKE_VERSION} VERSION_LESS 3.29)
  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 else()
- cmake_policy(VERSION 3.27)
+ cmake_policy(VERSION 3.29)
 endif()
 
 if(_pybind11_cmp0148)
@@ -107,15 +107,25 @@ endif()
 option(PYBIND11_INSTALL "Install pybind11 header files?" ${PYBIND11_MASTER_PROJECT})
 option(PYBIND11_TEST "Build pybind11 test suite?" ${PYBIND11_MASTER_PROJECT})
 option(PYBIND11_NOPYTHON "Disable search for Python" OFF)
+option(PYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION
+ "To enforce that a handle_type_name<> specialization exists" OFF)
 option(PYBIND11_SIMPLE_GIL_MANAGEMENT
  "Use simpler GIL management logic that does not support disassociation" OFF)
+option(PYBIND11_NUMPY_1_ONLY
+ "Disable NumPy 2 support to avoid changes to previous pybind11 versions." OFF)
 set(PYBIND11_INTERNALS_VERSION
  ""
  CACHE STRING "Override the ABI version, may be used to enable the unstable ABI.")
 
+if(PYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION)
+ add_compile_definitions(PYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION)
+endif()
 if(PYBIND11_SIMPLE_GIL_MANAGEMENT)
  add_compile_definitions(PYBIND11_SIMPLE_GIL_MANAGEMENT)
 endif()
+if(PYBIND11_NUMPY_1_ONLY)
+ add_compile_definitions(PYBIND11_NUMPY_1_ONLY)
+endif()
 
 cmake_dependent_option(
  USE_PYTHON_INCLUDE_DIR

README.rst

@@ -36,10 +36,10 @@ with everything stripped away that isn't relevant for binding
 generation. Without comments, the core header files only require ~4K
 lines of code and depend on Python (3.6+, or PyPy) and the C++
 standard library. This compact implementation was possible thanks to
-some of the new C++11 language features (specifically: tuples, lambda
-functions and variadic templates). Since its creation, this library has
-grown beyond Boost.Python in many ways, leading to dramatically simpler
-binding code in many common situations.
+some C++11 language features (specifically: tuples, lambda functions and
+variadic templates). Since its creation, this library has grown beyond
+Boost.Python in many ways, leading to dramatically simpler binding code in many
+common situations.
 
 Tutorial and reference documentation is provided at
 `pybind11.readthedocs.io <https://pybind11.readthedocs.io/en/latest>`_.
@@ -71,6 +71,7 @@ pybind11 can map the following core C++ features to Python:
 - Internal references with correct reference counting
 - C++ classes with virtual (and pure virtual) methods can be extended
  in Python
+- Integrated NumPy support (NumPy 2 requires pybind11 2.12+)
 
 Goodies
 -------

docs/advanced/embedding.rst

@@ -18,7 +18,7 @@ information, see :doc:`/compiling`.
 
 .. code-block:: cmake
 
- cmake_minimum_required(VERSION 3.5...3.27)
+ cmake_minimum_required(VERSION 3.5...3.29)
  project(example)
 
  find_package(pybind11 REQUIRED) # or `add_subdirectory(pybind11)`