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 #5085

Merged
merged 2 commits into from
Apr 2, 2024
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Apr 2, 2024

Description

Helper/scratch PR for testing.

Suggested changelog entry:

pre-commit-ci bot and others added 2 commits April 2, 2024 11:14
* chore(deps): update pre-commit hooks

updates:
- [github.com/pre-commit/mirrors-clang-format: v17.0.6 → v18.1.2](pre-commit/mirrors-clang-format@v17.0.6...v18.1.2)
- [github.com/astral-sh/ruff-pre-commit: v0.2.0 → v0.3.5](astral-sh/ruff-pre-commit@v0.2.0...v0.3.5)
- [github.com/pre-commit/mirrors-mypy: v1.8.0 → v1.9.0](pre-commit/mirrors-mypy@v1.8.0...v1.9.0)
- [github.com/Lucas-C/pre-commit-hooks: v1.5.4 → v1.5.5](Lucas-C/pre-commit-hooks@v1.5.4...v1.5.5)
- [github.com/sirosen/texthooks: 0.6.4 → 0.6.6](sirosen/texthooks@0.6.4...0.6.6)
- [github.com/shellcheck-py/shellcheck-py: v0.9.0.6 → v0.10.0.1](shellcheck-py/shellcheck-py@v0.9.0.6...v0.10.0.1)
- [github.com/PyCQA/pylint: v3.0.3 → v3.1.0](pylint-dev/pylint@v3.0.3...v3.1.0)
- [github.com/python-jsonschema/check-jsonschema: 0.28.0 → 0.28.1](python-jsonschema/check-jsonschema@0.28.0...0.28.1)

* style: pre-commit fixes

* fix(types): correction for better typing

Signed-off-by: Henry Schreiner <[email protected]>

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <[email protected]>
@rwgk rwgk changed the base branch from master to smart_holder April 2, 2024 15:25
@rwgk rwgk closed this Apr 2, 2024
@rwgk rwgk reopened this Apr 2, 2024
@rwgk rwgk merged commit 08a97da into pybind:smart_holder Apr 2, 2024
168 of 302 checks passed
@rwgk rwgk deleted the sh_merge_master branch April 2, 2024 16:27
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Apr 2, 2024
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Apr 2, 2024
rwgk pushed a commit to rwgk/pybind11 that referenced this pull request Jun 10, 2024
…TERNALS_SH_DEF` was accidentally removed from `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID`.
rwgk pushed a commit to rwgk/pybind11 that referenced this pull request Jun 11, 2024
…TERNALS_SH_DEF` was accidentally removed from `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID`.
rwgk pushed a commit that referenced this pull request Jun 11, 2024
…F` missing in `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID` (#5159)

* Fix oversight: Add `-DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"` for new `manylinux` job (Manylinux on 🐍 3.13t • GIL).

* Fix terrible merge accident introduced with #5085: `PYBIND11_INTERNALS_SH_DEF` was accidentally removed from `PYBIND11_INTERNALS_ID` and `PYBIND11_MODULE_LOCAL_ID`.
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.

1 participant