Use FrozenOrderedSet with PexRequirements and PexInterpreterConstraints
#9229
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
blorente
approved these changes
Mar 4, 2020
| constraint | ||
| for target_adaptor in adaptors | ||
| for constraint in python_setup.compatibility_or_constraints( | ||
| getattr(target_adaptor, "compatibility", None) | ||
| ) | ||
| if isinstance(target_adaptor, PythonTargetAdaptor) | ||
| } | ||
| return PexInterpreterConstraints(constraint_set=tuple(sorted(interpreter_constraints))) | ||
| return PexInterpreterConstraints(constraints) |
There was a problem hiding this comment.
all these named arguments going away feels orthogonal to this change. I kind of like them going away because the constructors only take one argument, but still it's a bit odd.
Not a problem at all though :)
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.
For both
PexRequirementsandPexInterpreterConstraints—which are both collections ofstrs—we desire these properties:We previously achieved this by using
tuple(sorted(set(elements)))because at the time that was the best we could do now. Now, we can simply useFrozenOrderedSet(sorted(elements))to get all 4 properties.FrozenOrderedSetis both more ergonomic and better expresses the intent of what we're doing.--
We also provide custom constructors for both types to allow accepting a flexible
Iterable[str], rather than something specific likeTuple[str, ...]. This makes for cleaner call sites. More importantly, it allows us to move the sorting into the constructor, rather than expecting the call sites to have been pre-sorted.