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

bpo-38121: Sync importlib.metadata with 0.22 backport #15993

Merged
merged 3 commits into from
Sep 12, 2019
Merged

bpo-38121: Sync importlib.metadata with 0.22 backport #15993

merged 3 commits into from
Sep 12, 2019

Conversation

jaraco
Copy link
Member

@jaraco jaraco commented Sep 11, 2019

Copy link
Member

@pganssle pganssle left a comment

Choose a reason for hiding this comment

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

LGTM! Will merge per our conversation at the sprint.

@miss-islington
Copy link
Contributor

Thanks @jaraco for the PR, and @pganssle for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

@jaraco jaraco deleted the feature/importlib-metadata-0.22 branch September 12, 2019 11:02
@miss-islington
Copy link
Contributor

Sorry, @jaraco and @pganssle, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8ed6503eca4e3ea4949479d8d7fd9ffd54f81038 3.8

@jaraco
Copy link
Member Author

jaraco commented Sep 12, 2019

The issue is the known conflicts with importlib_external.h, generated by make regen-importlib.

I thought I could run this, but I cannot currently. @pganssle if you feel like tackling it, go for it. Otherwise, I'll look this evening.

@pganssle
Copy link
Member

@jaraco I don't know that I know the code well enough to handle resolving the conflicts.

DinoV pushed a commit to DinoV/cpython that referenced this pull request Sep 12, 2019
* bpo-38121: Sync importlib.metadata with 0.22 backport

* 📜🤖 Added by blurb_it.
@jaraco jaraco self-assigned this Sep 12, 2019
jaraco added a commit that referenced this pull request Sep 12, 2019
* bpo-38121: Sync importlib.metadata with 0.22 backport

* 📜🤖 Added by blurb_it..
(cherry picked from commit 8ed6503)

Co-authored-by: Jason R. Coombs <[email protected]>
@bedevere-bot
Copy link

GH-16064 is a backport of this pull request to the 3.8 branch.

jaraco added a commit that referenced this pull request Sep 12, 2019
GH-16064)

* bpo-38121: Sync importlib.metadata with 0.22 backport

* 📜🤖 Added by blurb_it..
(cherry picked from commit 8ed6503)

Co-authored-by: Jason R. Coombs <[email protected]>
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