-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30111 from rwgk/pywrapcc_merge_sh
git merge smart_holder (pybind/pybind11#5076)
- Loading branch information
Showing
45 changed files
with
731 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -109,12 +109,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 | ||
|
@@ -139,11 +142,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 | ||
|
@@ -661,6 +666,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: > | ||
|
@@ -896,8 +906,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/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -121,12 +121,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 | ||
|
@@ -152,11 +155,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 | ||
|
@@ -682,6 +687,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: > | ||
|
@@ -921,8 +931,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/[email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.