pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-11 00:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic part of merging branch 'master' into sh_merge_master.

Browse Source 
The only manual intervention was to remove the merge conflict markers in pybind11.h.

TODO in separate commit: complete removal of the obsolete detail/pragma_warning_block.h.
This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-08-14 07:54:40 -07:00
parent ee945e7058 1bcd94c481
commit 8865d28317
73 changed files with 354 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/configure.yml vendored
View File

@@ -56,7 +56,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@v1.9
uses: jwlawson/actions-setup-cmake@v1.10
with:
cmake-version: ${{ matrix.cmake }}