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

Merged
merged 10 commits into from
Dec 2, 2023
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Dec 2, 2023

Description

Helper/scratch PR for testing.

Suggested changelog entry:

henryiii and others added 10 commits November 15, 2023 18:59
* fix: avoid really slow compile on emscripten

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

* Update tools/pybind11Common.cmake

---------

Signed-off-by: Henry Schreiner <[email protected]>
* ci: add more versions of numpy/scipy/pypy

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

* Apply suggestions from code review

* style: pre-commit fixes

* Update requirements.txt

* Update requirements.txt

* Apply suggestions from code review

---------

Signed-off-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…rt (pybind#4941)

* fix(cmake): findpython issues and 3.12 support for pybind11_find_import

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

* Update pybind11NewTools.cmake

---------

Signed-off-by: Henry Schreiner <[email protected]>
* pybind11.pc: use pcfiledir for relative destinations

If the datarootdir is absolute, just use the absolute path directly.
However, if it is relative, we can compute the prefix from the location
of the `.pc` file itself. This allows the install to be relocatable.

* chore: use 3.20's cmake_path if available

* style: pre-commit fixes

* Update CMakeLists.txt

---------

Co-authored-by: Henry Schreiner <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [deadsnakes/action](https://github.com/deadsnakes/action) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/deadsnakes/action/releases)
- [Commits](deadsnakes/action@v3.0.1...v3.1.0)

---
updated-dependencies:
- dependency-name: deadsnakes/action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

* Enable `bind_map` with `using` declarations.

* style: pre-commit fixes

* Enable directives in bind_vector

* Add tests for bind_ and using directives

* style: pre-commit fixes

* Remove C++17 functions

* Fix test comment

* Add minimal user like map py test

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@rwgk rwgk merged commit 3d39f29 into pybind:smart_holder Dec 2, 2023
154 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Dec 2, 2023
@rwgk rwgk deleted the sh_merge_master branch December 2, 2023 09:13
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Dec 2, 2023
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.

4 participants