Merge branch 'master' into henryiii-patch-3

This commit is contained in:
Henry Schreiner
2026-02-10 00:28:02 -05:00
committed by GitHub
18 changed files with 453 additions and 144 deletions

View File

@@ -84,7 +84,7 @@ jobs:
python-version: '3.12'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
- runs-on: ubuntu-latest
python-version: '3.13t'
python-version: '3.14t'
cmake-args: -DCMAKE_CXX_STANDARD=20 -DPYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION=ON
- runs-on: ubuntu-latest
python-version: '3.14'
@@ -102,12 +102,12 @@ jobs:
- runs-on: macos-15-intel
python-version: '3.11'
cmake-args: -DPYBIND11_TEST_SMART_HOLDER=ON
- runs-on: macos-15-intel
python-version: '3.13'
cmake-args: -DCMAKE_CXX_STANDARD=11
- runs-on: macos-latest
python-version: '3.12'
cmake-args: -DCMAKE_CXX_STANDARD=17 -DPYBIND11_DISABLE_HANDLE_TYPE_NAME_DEFAULT_IMPLEMENTATION=ON
- runs-on: macos-15-intel
python-version: '3.13t'
cmake-args: -DCMAKE_CXX_STANDARD=11
- runs-on: macos-latest
python-version: '3.14t'
cmake-args: -DCMAKE_CXX_STANDARD=20
@@ -138,9 +138,6 @@ jobs:
- runs-on: windows-2022
python-version: '3.13'
cmake-args: -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebugDLL
- runs-on: windows-latest
python-version: '3.13t'
cmake-args: -DCMAKE_CXX_STANDARD=17
- runs-on: windows-latest
python-version: '3.14'
cmake-args: -DCMAKE_CXX_STANDARD=20
@@ -240,11 +237,23 @@ jobs:
manylinux:
name: Manylinux on 🐍 3.13t • GIL
name: Manylinux on 🐍 ${{ matrix.python-version }} (${{ matrix.container }})
if: github.event.pull_request.draft == false
strategy:
fail-fast: false
matrix:
include:
- container: quay.io/pypa/manylinux_2_28_x86_64:latest
python-version: '3.13t'
- container: quay.io/pypa/musllinux_1_2_x86_64:latest
python-version: '3.13t'
- container: quay.io/pypa/manylinux_2_28_x86_64:latest
python-version: '3.14t'
- container: quay.io/pypa/musllinux_1_2_x86_64:latest
python-version: '3.14t'
runs-on: ubuntu-latest
timeout-minutes: 40
container: quay.io/pypa/musllinux_1_2_x86_64:latest
container: ${{ matrix.container }}
steps:
- uses: actions/checkout@v6
with:
@@ -257,7 +266,7 @@ jobs:
run: uv tool install ninja
- name: Configure via preset
run: cmake --preset venv -DPYBIND11_CREATE_WITH_UV=python3.13t
run: cmake --preset venv -DPYBIND11_CREATE_WITH_UV="${{ matrix.python-version }}"
- name: Build C++11
run: cmake --build --preset venv
@@ -293,7 +302,7 @@ jobs:
debug: ${{ matrix.python-debug }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Valgrind cache
if: matrix.valgrind
@@ -561,7 +570,7 @@ jobs:
run: python3 -m pip install --upgrade pip
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Configure
shell: bash
@@ -897,7 +906,7 @@ jobs:
${{ matrix.python == '3.13' && runner.os == 'Windows' }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.13.0
@@ -947,7 +956,7 @@ jobs:
architecture: x86
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.13.0
@@ -998,7 +1007,7 @@ jobs:
run: python3 -m pip install -r tests/requirements.txt
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Configure C++20
run: >
@@ -1180,7 +1189,7 @@ jobs:
python-version: ${{ matrix.python }}
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v6

View File

@@ -64,7 +64,7 @@ jobs:
# An action for adding a specific version of CMake:
# https://github.com/jwlawson/actions-setup-cmake
- name: Setup CMake ${{ matrix.cmake }}
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
with:
cmake-version: ${{ matrix.cmake }}

View File

@@ -44,7 +44,7 @@ jobs:
- name: Setup Boost (Linux)
if: runner.os == 'Linux'
run: sudo apt-get install libboost-dev
run: sudo apt-get update && sudo apt-get install -y libboost-dev
- name: Setup Boost (macOS)
if: runner.os == 'macOS'

View File

@@ -36,7 +36,7 @@ jobs:
run: sudo apt-get install libboost-dev
- name: Update CMake
uses: jwlawson/actions-setup-cmake@v2.0
uses: jwlawson/actions-setup-cmake@v2.1
- name: Run pip installs
run: |