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

pkg_resources: improve WorkingSet.resolve(replace_conflicting=True) #1129

Merged
merged 3 commits into from Sep 3, 2017

Conversation

@benoit-pierre
Copy link
Member

@benoit-pierre benoit-pierre commented Aug 7, 2017

Correctly replace conflicting distributions in sub-requirements if possible (instead of only for top-level requirements passed as arguments).

Fix #1124.

@jaraco
Copy link
Member

@jaraco jaraco commented Aug 26, 2017

Looks good to me. Can you just add a changelog entry?

@jaraco
jaraco approved these changes Aug 26, 2017
Correctly replace conflicting distributions in sub-requirements
if possible (instead of only for top-level requirements passed
as arguments).

Fix #1124.
@benoit-pierre benoit-pierre force-pushed the benoit-pierre:fix_1124 branch from 3ae34cc to 3dc2066 Aug 29, 2017
@benoit-pierre
Copy link
Member Author

@benoit-pierre benoit-pierre commented Aug 29, 2017

Done.

@jaraco jaraco merged commit f7e27cc into pypa:master Sep 3, 2017
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@benoit-pierre benoit-pierre deleted the benoit-pierre:fix_1124 branch Sep 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants