Skip to content

[smart_holder] git merge master #3794

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

Merged
merged 9 commits into from
Mar 10, 2022
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Mar 10, 2022

Description

Helper/scratch PR for testing.

Suggested changelog entry:

pre-commit-ci bot and others added 9 commits February 28, 2022 21:35
updates:
- [github.com/Lucas-C/pre-commit-hooks: v1.1.12 → v1.1.13](Lucas-C/pre-commit-hooks@v1.1.12...v1.1.13)
- [github.com/hadialqattan/pycln: v1.2.0 → v1.2.4](hadialqattan/pycln@v1.2.0...v1.2.4)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* chore: minor fixes for newer PyPys

* ci: fix issue with PyPy
* Use sysconfig in Python >= 3.10

Rely on sysconfig for installation paths for Python >= 3.10. distutils
has been deprecated and will be removed.

Fixes: pybind#3677

* Explicitly select the posix_prefix scheme for platinclude on Debian

Debian's default scheme is posix_local, for installing locally-built
packages to /usr/local/.  We want to find the Python headers in /usr/,
so search posix_prefix.
* Test out Python 3.11 migration

* Clean up a bit

* Remove todo

* Test workaround

* Fix potential bug uncovered in 3.11

* Try to fix it more

* last ditch fix

* Revert. Tp-traverse isn't the problem

* Test workaround

* Try this hack

* Revert MRO changes

* Use f_back properly

* Qualify auto

* Update include/pybind11/pybind11.h

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Simplify code slightly

* Ensure co_varnames decref if dict_getitem throws

* Eager decref f_code

Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rwgk
Copy link
Collaborator Author

rwgk commented Mar 10, 2022

I will go ahead and merge this PR straightaway.

@rwgk rwgk merged commit bcc241f into pybind:smart_holder Mar 10, 2022
@rwgk rwgk deleted the sh_merge_master branch March 10, 2022 19:54
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Mar 10, 2022
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Mar 10, 2022
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.

5 participants