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

Merge master into the abi3 branch to resolve conflicts #1220

Merged
merged 49 commits into from
Oct 10, 2020

Conversation

alex
Copy link
Contributor

@alex alex commented Oct 10, 2020

No description provided.

rob-thatcher and others added 30 commits September 11, 2020 16:58
Fix cargo test with Anaconda python, and divergent gcc versions.
Don't consider it cross-compilation when building for 32-bit Windows on 64-bit windows
* Fix compilation on platforms that don't use i8 for c_char

This commit changes the cast of an c_char to be a c_char type instead of
i8. On x86 platforms i8 == c_char, but it can also be u8 on other
platforms. [1][2] This should fix compilation on those platforms by just
using the c_char type so that we're casting as the right type regardless
of which platform PyO3 is being built for.

Fixes PyO3#1181

[1] https://doc.rust-lang.org/std/os/raw/type.c_char.html
[2] https://github.com/rust-lang/rust/blob/master/library/std/src/os/raw/mod.rs#L55-L99

* Add changelog entry
Looks like this just got out of date at some point.
Update Wasmer Python extension link
Sorry for the noise, there were some errors in PyO3#1197 which github did not show until after I merged 😞
Add documentation for raw_pycfuntion
Updates the requirements on [paste](https://github.com/dtolnay/paste) to permit the latest version.
- [Release notes](https://github.com/dtolnay/paste/releases)
- [Commits](dtolnay/paste@0.1.6...1.0.1)

Signed-off-by: dependabot[bot] <[email protected]>
kngwyu and others added 19 commits September 23, 2020 17:15
Update paste requirement from 0.1.6 to 1.0.1
* allow keyword arguments without default value

* allow keyword-only arguments
This is a useful API in long-running Rust code, which lets users
cancel evaluation by pressing Ctrl-C, and run any other signal
handlers that have been set using the signal module.
Add wrapper for PyErr_CheckSignals() to Python.
Add null-check for function's documents
Copy link
Member

@kngwyu kngwyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kngwyu kngwyu merged commit d42dbda into PyO3:abi3 Oct 10, 2020
@alex alex deleted the abi3-merge-master branch October 10, 2020 15:34
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.

9 participants