Bugfix: Empty and Any markers saved to lockfile#1650
Merged
sdispater merged 3 commits intopython-poetry:masterfrom Dec 6, 2019
Merged
Bugfix: Empty and Any markers saved to lockfile#1650sdispater merged 3 commits intopython-poetry:masterfrom
sdispater merged 3 commits intopython-poetry:masterfrom
Conversation
JBKahn
changed the title
Contributor
Author
|
@sdispater thoughts? |
Contributor
Author
|
@finswimmer I see you're also able to commit on this repo, any thoughts? |
sdispater
requested changes
Dec 6, 2019
Contributor
Author
|
Same for empty? |
Co-Authored-By: Sébastien Eustace <[email protected]>
Member
|
@JBKahn No, it's fine for |
Contributor
Author
|
K, then I think with that test change, this should be good for the next release? |
Contributor
Author
|
@sdispater on a side note, I'm not super familiar with the code yet but if you're looking for help maintaining poetry, I'm happy to give some time to the project. |
shenek
pushed a commit
to shenek/poetry
that referenced
this pull request
Dec 31, 2019
* do not write empty or any markers * Update poetry/version/markers.py Co-Authored-By: Sébastien Eustace <[email protected]> * Update test_markers.py
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.0b3when we changed that behaviour it's now theAnymarker and when it stringifies that when generating the lockfile it creates a format the lockfile doesn't support.bugfix: Originally, the
MarkerUniondidn't correctly respond tois_anyoris_emptybecause 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.