Fix the resolve check in the presence of platform constraints. #877
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Eric-Arellano
approved these changes
Feb 7, 2020
pex/resolver.py
Outdated
| @@ -601,7 +602,10 @@ def _check_resolve(self, resolved_distributions): | |||
| ) | |||
| else: | |||
| resolved_dist = resolved_requirement_dist.distribution | |||
| if resolved_dist not in requirement: | |||
| # If a requirement is resolved vacuously due to a platform constraint (e.g., 'pathlib2; python_version < "3"' | |||
| # when we're on Python 3) then resolved_dist will be None, and this is not an error. | |||
There was a problem hiding this comment.
I think you might have meant to use a comma:
Suggested change
| # when we're on Python 3) then resolved_dist will be None, and this is not an error. | |
| # when we're on Python 3, then resolved_dist will be None, and this is not an error. |
There was a problem hiding this comment.
No, this closes the paren opened before "e.g.,"
If a requirement is resolved vacuously due to a platform constraint (e.g., 'pathlib2; python_version < "3"' when we're on Python 3) then it is not an error to not have a resolved dist.
benjyw
force-pushed
the
fix_resolve_check
branch
from
c1427b6
to
dcfe64e
Compare
benjyw
added a commit
to benjyw/pex
that referenced
this pull request
Feb 9, 2020
pex-tool#877)" This reverts commit 89f026c.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a requirement is resolved vacuously due to a platform constraint
(e.g., 'pathlib2; python_version < "3"' when we're on Python 3) then
it is not an error to not have a resolved dist.