-
Notifications
You must be signed in to change notification settings - Fork 7
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 #30102 from rwgk/pywrapcc_merge_sh
git merge smart_holder (pybind/pybind11#5026, pybind/pybind11#5033)
- Loading branch information
Showing
8 changed files
with
59 additions
and
44 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 |
---|---|---|
|
@@ -9,3 +9,7 @@ updates: | |
actions: | ||
patterns: | ||
- "*" | ||
ignore: | ||
- dependency-name: actions/checkout | ||
versions: | ||
- "<5" |
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 |
---|---|---|
|
@@ -87,11 +87,11 @@ jobs: | |
run: brew install boost | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Cache wheels | ||
if: runner.os == 'macOS' | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
with: | ||
# This path is specific to macOS - we really only need it for PyPy NumPy wheels | ||
# See https://github.com/actions/cache/blob/master/examples.md#python---pip | ||
|
@@ -215,11 +215,11 @@ jobs: | |
debug: ${{ matrix.python-debug }} | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Valgrind cache | ||
if: matrix.valgrind | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
id: cache-valgrind | ||
with: | ||
path: valgrind | ||
|
@@ -485,7 +485,7 @@ jobs: | |
run: python3 -m pip install --upgrade pip | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Configure | ||
shell: bash | ||
|
@@ -530,8 +530,6 @@ jobs: | |
# Testing on ICC using the oneAPI apt repo | ||
icc: | ||
runs-on: ubuntu-20.04 | ||
strategy: | ||
fail-fast: false | ||
|
||
name: "🐍 3 • ICC latest • x64" | ||
|
||
|
@@ -798,7 +796,7 @@ jobs: | |
architecture: x86 | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Prepare MSVC | ||
uses: ilammy/[email protected] | ||
|
@@ -851,7 +849,7 @@ jobs: | |
architecture: x86 | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Prepare MSVC | ||
uses: ilammy/[email protected] | ||
|
@@ -902,7 +900,7 @@ jobs: | |
python3 -m pip install -r tests/requirements.txt | ||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Configure C++20 | ||
run: > | ||
|
@@ -1066,7 +1064,7 @@ jobs: | |
python-version: ${{ matrix.python }} | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Install ninja-build tool | ||
uses: seanmiddleditch/gha-setup-ninja@v4 | ||
|
@@ -1136,7 +1134,7 @@ jobs: | |
run: clang++ --version | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Run pip installs | ||
run: | | ||
|
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 |
---|---|---|
|
@@ -99,11 +99,11 @@ jobs: | |
run: brew install boost | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Cache wheels | ||
if: runner.os == 'macOS' | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
with: | ||
# This path is specific to macOS - we really only need it for PyPy NumPy wheels | ||
# See https://github.com/actions/cache/blob/master/examples.md#python---pip | ||
|
@@ -230,11 +230,11 @@ jobs: | |
debug: ${{ matrix.python-debug }} | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Valgrind cache | ||
if: matrix.valgrind | ||
uses: actions/cache@v3 | ||
uses: actions/cache@v4 | ||
id: cache-valgrind | ||
with: | ||
path: valgrind | ||
|
@@ -502,7 +502,7 @@ jobs: | |
run: python3 -m pip install --upgrade pip | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Configure | ||
shell: bash | ||
|
@@ -549,8 +549,6 @@ jobs: | |
# Testing on ICC using the oneAPI apt repo | ||
icc: | ||
runs-on: ubuntu-20.04 | ||
strategy: | ||
fail-fast: false | ||
|
||
name: "🐍 3 • ICC latest • x64" | ||
|
||
|
@@ -821,7 +819,7 @@ jobs: | |
architecture: x86 | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Prepare MSVC | ||
uses: ilammy/[email protected] | ||
|
@@ -875,7 +873,7 @@ jobs: | |
architecture: x86 | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Prepare MSVC | ||
uses: ilammy/[email protected] | ||
|
@@ -927,7 +925,7 @@ jobs: | |
python3 -m pip install -r tests/requirements.txt | ||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Configure C++20 | ||
run: > | ||
|
@@ -1096,7 +1094,7 @@ jobs: | |
python-version: ${{ matrix.python }} | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Install ninja-build tool | ||
uses: seanmiddleditch/gha-setup-ninja@v4 | ||
|
@@ -1167,7 +1165,7 @@ jobs: | |
run: clang++ --version | ||
|
||
- name: Update CMake | ||
uses: jwlawson/actions-setup-cmake@v1.14 | ||
uses: jwlawson/actions-setup-cmake@v2.0 | ||
|
||
- name: Run pip installs | ||
run: | | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,7 @@ jobs: | |
python-version: "3.x" | ||
- name: Add matchers | ||
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json" | ||
- uses: pre-commit/[email protected].0 | ||
- uses: pre-commit/[email protected].1 | ||
with: | ||
# Slow hooks are marked with manual - slow is okay here, run them too | ||
extra_args: --hook-stage manual --all-files | ||
|
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