Bugfix: Empty and Any markers saved to lockfile #1650
Merged
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.
When locking some private packages of ours (that have extras) it used to copy those extras over in
1.0.0b3
when we changed that behaviour it's now theAny
marker and when it stringifies that when generating the lockfile it creates a format the lockfile doesn't support.bugfix: Originally, the
MarkerUnion
didn't correctly respond tois_any
oris_empty
because it didn't evaluate the collection of markers which led to it trying to stringify those markers.This on conjunction with the other fix means that the
[Any, Any]
case is simply excluded from the lockfile just like a single Any case.bugfix
Before:
' or '.join([Any, Any])
->' or '
' or '.join([Any, REAL MARKER])
->' or REAL MARKER'
' or '.join([Empty, Empty])
->'<empty> or <empty>'
Now
' or '.join([Any, Any])
->''
' or '.join([Any, REAL MARKER])
->'REAL MARKER'
' or '.join([Empty, Empty])
->''
This means if we have a mix of markers with any/empty that won't be propagated to the lockfile.