[smart_holder] Fix git merge accident (pybind11/detail/descr.h). #5086
Conversation
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 was noticed only when manually reviewing the diffs with the Google review tools.
|
The CI failures are unrelated. See #3939. |
rwgk
pushed a commit
to rwgk/pybind11
that referenced
this pull request
Jun 12, 2024
* Fix merge accident in pybind11/detail/descr.h (pybind#5086) This was noticed only when manually reviewing the diffs with the Google review tools. * Fix typo in changelog date (pybind#5096) This was actually released in 2024! * ci: macos-latest is changing to macos-14 ARM runners (pybind#5109) Committed via https://github.com/asottile/all-repos * chore: docs and nox bump (pybind#5071) Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * docs(numpy): drop duplicated ndim (pybind#5119) * chore(deps): bump idna from 3.6 to 3.7 in /docs (pybind#5121) Bumps [idna](https://github.com/kjd/idna) from 3.6 to 3.7. - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst) - [Commits](kjd/idna@v3.6...v3.7) --- updated-dependencies: - dependency-name: idna dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /docs (pybind#5122) Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@3.1.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump the actions group with 1 update (pybind#5082) * chore(deps): bump the actions group with 1 update Bumps the actions group with 1 update: [actions/labeler](https://github.com/actions/labeler). Updates `actions/labeler` from 4 to 5 - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@v4...v5) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] <support@github.com> * ci: fix labeler Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * ci: move eigen to 64-bit only Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> * chore(deps): update pre-commit hooks (pybind#5123) * chore(deps): update pre-commit hooks updates: - [github.com/pre-commit/mirrors-clang-format: v18.1.2 → v18.1.4](pre-commit/mirrors-clang-format@v18.1.2...v18.1.4) - [github.com/astral-sh/ruff-pre-commit: v0.3.5 → v0.4.3](astral-sh/ruff-pre-commit@v0.3.5...v0.4.3) - [github.com/pre-commit/mirrors-mypy: v1.9.0 → v1.10.0](pre-commit/mirrors-mypy@v1.9.0...v1.10.0) - [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0) - [github.com/python-jsonschema/check-jsonschema: 0.28.1 → 0.28.2](python-jsonschema/check-jsonschema@0.28.1...0.28.2) * style: pre-commit fixes * Update .pre-commit-config.yaml --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com> * --- (pybind#5130) updated-dependencies: - dependency-name: requests dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: support Python 3.13.0b1 (PEP 667 fix) (pybind#5127) * ci: add Python 3.13 Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * tests: run the gc for 3.13+ Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * Revert "tests: run the gc for 3.13+" This reverts commit fe8a3ce. * ci: drop macos ARM for now, need pin updates Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * fix: use Python 3.13 API if on 3.13 Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * chore: some cleanup (pybind#5137) * Tracking ci.yml changes from master. --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Tim Stumbaugh <stum@hudson-trading.com> Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com> Co-authored-by: nobkd <44443899+nobkd@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This was noticed only when manually reviewing the diffs with the Google review tools.
Suggested changelog entry: