Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[smart_holder] git merge master #5497

Merged
merged 5 commits into from
Jan 16, 2025
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Jan 16, 2025

Description

Helper/scratch PR for testing.

Suggested changelog entry:

pre-commit-ci bot and others added 5 commits January 6, 2025 18:43
updates:
- [github.com/pre-commit/mirrors-clang-format: v19.1.4 → v19.1.6](pre-commit/mirrors-clang-format@v19.1.4...v19.1.6)
- [github.com/astral-sh/ruff-pre-commit: v0.8.1 → v0.8.6](astral-sh/ruff-pre-commit@v0.8.1...v0.8.6)
- [github.com/pre-commit/mirrors-mypy: v1.13.0 → v1.14.1](pre-commit/mirrors-mypy@v1.13.0...v1.14.1)
- [github.com/PyCQA/pylint: v3.3.2 → v3.3.3](pylint-dev/pylint@v3.3.2...v3.3.3)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix data race when using shared variables (free threading)

In the free threading build, there's a race between wrapper re-use and
wrapper deallocation. This can happen with a static variable accessed by
multiple threads.

Fixing this requires using some private CPython APIs: _Py_TryIncref and
_PyObject_SetMaybeWeakref. The implementations of these functions are
included until they're made available as public ("unstable") APIs.

Fixes pybind#5489

* style: pre-commit fixes

* Avoid unused parameter

* Add missing return for default build

* Changes from review

* Assign result to local variable

* s/clang-tidy/ruff

* clang-tidy: static is redundant

* Use 'noqa: B018'

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
```
mypy.....................................................................Failed
- hook id: mypy
- exit code: 1

ubench/holder_comparison.py:96: error: Unused "type: ignore" comment  [unused-ignore]
ubench/holder_comparison.py:97: error: Unused "type: ignore" comment  [unused-ignore]
Found 2 errors in 1 file (checked 12 source files)
```
@rwgk rwgk merged commit 195a7c9 into pybind:smart_holder Jan 16, 2025
78 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Jan 16, 2025
@rwgk rwgk deleted the sh_merge_master branch January 16, 2025 21:16
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Jan 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants