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 abi3 branch, resolving conflicts #1245

Merged
merged 31 commits into from
Oct 19, 2020

Conversation

alex
Copy link
Contributor

@alex alex commented Oct 18, 2020

No description provided.

davidhewitt and others added 22 commits October 12, 2020 16:18
This lets us treat it no different from other types
like PySequence.
Co-authored-by: David Hewitt <[email protected]>
Remove special case of PyIterator
Remove symbols that are removed in python 3.10
Displays type(obj) instead of repr(obj) and uses `cannot` instead of
`can't`
to be more consistent with existing python error messages.

See discussion at PyO3#1212.
…ame-to-conversion-error

Enhance error messages of conversion errors
@alex
Copy link
Contributor Author

alex commented Oct 18, 2020

Seems we've run into a pickle. PyIter_Check is not available in ABI3 until Python 3.8. I'm not quite sure what the right way to resolve this is.

@alex alex force-pushed the abi3-merge-master branch from c22b879 to e8dc226 Compare October 18, 2020 15:23
@kngwyu
Copy link
Member

kngwyu commented Oct 18, 2020

PyIter_Check is not available in ABI3 until Python 3.8. I'm not quite sure what the right way to resolve this is.

I checked CPython source but just found no alternative. Maybe opting-in the feature is the only solution.

@alex alex force-pushed the abi3-merge-master branch from e8dc226 to 265db33 Compare October 18, 2020 15:31
@alex
Copy link
Contributor Author

alex commented Oct 18, 2020

Ok, that's what I did -- PyTryFrom for PyIterator is now only on any(not(Py_LIMITED_API), Py_3_8)

@kngwyu
Copy link
Member

kngwyu commented Oct 18, 2020

BTW, I'm now preparing the proc-macro refactoring for abi3 branch, which (I hope) would make this branch ready to merge.
Sorry for the delay, though.

@alex
Copy link
Contributor Author

alex commented Oct 18, 2020

Ok. I hope we can get this merged soon, the merge conflicts are no fun.

@alex
Copy link
Contributor Author

alex commented Oct 18, 2020

I have no idea why the one Windows py35 build is failing. I think @davidhewitt mentioned that ya'll plan to drop py35 anyways.

davidhewitt and others added 6 commits October 18, 2020 18:36
@davidhewitt
Copy link
Member

Ok, that's what I did -- PyTryFrom for PyIterator is now only on any(not(Py_LIMITED_API), Py_3_8)

👍 Good thing I added extra test coverage as good hygiene during #1176!

I think @davidhewitt mentioned that ya'll plan to drop py35 anyways.

See #1250 - do you want me to merge this PR now or wait until that merges?

@alex
Copy link
Contributor Author

alex commented Oct 18, 2020 via email

@alex
Copy link
Contributor Author

alex commented Oct 19, 2020

Because something must always be broken, GHA appears to have not started one of the jobs. But all the other jobs passed.

@davidhewitt
Copy link
Member

CI is all green to me! Thanks, merging.

@davidhewitt davidhewitt merged commit f74b649 into PyO3:abi3 Oct 19, 2020
@alex alex deleted the abi3-merge-master branch October 19, 2020 21:11
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.

6 participants