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

Merged
merged 11 commits into from
Nov 18, 2022
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Nov 18, 2022

Description

Helper/scratch PR for testing.

Suggested changelog entry:

Ralf W. Grosse-Kunstleve and others added 11 commits October 31, 2022 12:18
…#4297)

* Fix & test for issue pybind#4288 (unicode surrogate character in Python exception message).

* DRY `message_unavailable_exc`

* fix: add a constexpr

Co-authored-by: Aaron Gokaslan <[email protected]>

* style: pre-commit fixes

Co-authored-by: Henry Schreiner <[email protected]>
Co-authored-by: Aaron Gokaslan <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…pybind#4298)

Background: pybind#2999, pybind#4105, pybind#4283, pybind#4284

In a nutshell:

* Only macOS actually needs `PYBIND11_EXPORT_EXCEPTION` (pybind#4284).

* Evidently (pybind#4283), under macOS `PYBIND11_EXPORT_EXCEPTION` does not run the risk of introducing ODR violations,

* but evidently (pybind#4283) under Linux it does, in the presumably rare/unusual situation that `RTLD_GLOBAL` is used.

* Windows does no have the equivalent of `RTLD_GLOBAL`, therefore `PYBIND11_EXPORT_EXCEPTION` has no practical benefit, on the contrary, noisy warning suppression pragmas are needed, therefore it is best left empty.
* docs: prepare for 2.10.1 release

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

* Update changelog.rst

* docs: update changelog with final list of PRs

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

* Update docs/changelog.rst

* chore: one more changelog bump

Signed-off-by: Henry Schreiner <[email protected]>
updates:
- [github.com/asottile/pyupgrade: v2.38.2 → v3.2.0](asottile/pyupgrade@v2.38.2...v3.2.0)
- [github.com/psf/black: 22.8.0 → 22.10.0](psf/black@22.8.0...22.10.0)
- [github.com/PyCQA/pylint: v2.15.3 → v2.15.5](pylint-dev/pylint@v2.15.3...v2.15.5)
- [github.com/pre-commit/mirrors-mypy: v0.981 → v0.982](pre-commit/mirrors-mypy@v0.981...v0.982)
- [github.com/codespell-project/codespell: v2.2.1 → v2.2.2](codespell-project/codespell@v2.2.1...v2.2.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…ind#4254)

* Illustrate bug in functional.h

* style: pre-commit fixes

* Make functional casting more robust / add workaround

* Make function_record* casting even more robust

* See if this fixes PyPy issue

* It still fails on PyPy sadly

* Do not make new CTOR just yet

* Fix test

* Add name to ensure correctness

* style: pre-commit fixes

* Clean up tests + remove ifdef guards

* Add comments

* Improve comments, error handling, and safety

* Fix compile error

* Fix magic logic

* Extract helper function

* Fix func signature

* move to local internals

* style: pre-commit fixes

* Switch to simpler design

* style: pre-commit fixes

* Move to function_record

* style: pre-commit fixes

* Switch to internals, update tests and docs

* Fix lint

* Oops, forgot to resolve last comment

* Fix typo

* Update in response to comments

* Implement suggestion to improve test

* Update comment

* Simple fixes

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Aaron Gokaslan <[email protected]>
* Add windows_clang to ci.yml (previously tested under PRs pybind#4321, pybind#4319)

* Add `pip install --upgrade pip`, Show env, cosmetic changes

Already tested under PR pybind#4321
* fix pybind11Tools.cmake typo causing Unknown arguments

CMake Error at pybind11/tools/pybind11Tools.cmake:217 (if):
  if given arguments:
    "NOT" "MSVC" "AND" "NOT" "TEST" "MATCHES" "DEBUG|RELWITHDEBINFO"
  Unknown arguments specified
pybind#4325

* Apply the same fix in tools/pybind11NewTools.cmake

Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
* Add macos_brew_install_llvm to ci.yml

Added block transferred from PR pybind#4324

* `test_cross_module_exception_translator` xfail 'Homebrew Clang'

* Add `pip install numpy scipy` (tested already under PR pybind#4324).
@rwgk
Copy link
Collaborator Author

rwgk commented Nov 18, 2022

Skipping global testing before merging here. (Seems reasonably safe. Global testing will be done after merging here.)

@rwgk rwgk marked this pull request as ready for review November 18, 2022 18:07
@rwgk rwgk requested a review from henryiii as a code owner November 18, 2022 18:07
@rwgk rwgk merged commit d095a9b into pybind:smart_holder Nov 18, 2022
@rwgk rwgk deleted the sh_merge_master branch November 18, 2022 18:09
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