Skip to content

[smart_holder] git merge master - #5349

Merged
rwgk merged 7 commits into
pybind:smart_holderfrom
rwgk:sh_merge_master
Sep 2, 2024
Merged

[smart_holder] git merge master#5349
rwgk merged 7 commits into
pybind:smart_holderfrom
rwgk:sh_merge_master

Conversation

@rwgk

@rwgkrwgk commented Sep 2, 2024•
edited
Loading

Copy link
Copy Markdown
Collaborator

Description

Helper/scratch PR for testing.

Piggy-backed:

--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -13,7 +13,7 @@ on:
permissions: read-all
concurrency:
- group: test-sh-avl${{ github.ref }}+ group: test-${{ github.ref }}
cancel-in-progress: true
env:

Suggested changelog entry:

vnlitvinovand others
added 7 commits
September 2, 2024 09:01
@vnlitvinov@pre-commit-ci
Properly translate C++ exception to Python exception when creating Py…
aeda49e
…thon buffer from wrapped object (pybind#5324)
* Add test for throwing def_buffer case
* Translate C++ -> Python exceptions in buffer creation
This required a little refactoring to extract exception translation to a separate method
* Fix code formatting
* Fix "unused parameter" warning
* Refactor per review
* style: pre-commit fixes
* Address review comments
* Address review comments
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rwgk
Merge branch 'master' into sh_merge_master
e5f57c4
@rwgk
Remove stray `concurrency: group: test-${{ github.ref }} (thanks@rha…
4cc11dc
…schke for catching this)
@rwgk
Revert "Remove stray `concurrency: group: test-${{ github.ref }} (tha…
f0d2da3
…nks @rhaschke for catching this)"
This reverts commit 4cc11dc.
@rwgk
Without the group this happened:
c31e79a
[pybind/pybind11] CI workflow run
CI: No jobs were run
@rwgk
Remove suffix in `concurrency: group: test-${{ github.ref }} (thanks@…
53579b4
…rhaschke for helping)
@rwgk
gee, sorry, managed to confuse myself
a05a201
@rwgk
rwgk
merged commit a05a201
into
pybind:smart_holderSep 2, 2024
@github-actionsgithub-actionsBot
added
the 
needs changelog
Possibly needs a changelog entry
label
Sep 2, 2024
@rwgk
rwgk
deleted the

sh_merge_master

branch
September 2, 2024 18:47
@rwgkrwgk
removed
the 
needs changelog
Possibly needs a changelog entry
label
Sep 2, 2024
rwgk added a commit
to rwgk/pybind11
that referenced
this pull request
Sep 2, 2024
@rwgk
Apply ci.yml diff piggy-backed inpybind#5349
1baa98b
@rwgkrwgk
mentioned this pull request
Sep 2, 2024
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@rwgk@vnlitvinov