Avoid dropping pip sync requirements with markers
#4051
Merged
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
charliermarsh
commented
Jun 5, 2024
| @@ -968,7 +968,21 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag | |||
| .wait_blocking(&version_id) | |||
| .ok_or(ResolveError::Unregistered)?; | |||
|
|
|||
| return Ok(Dependencies::Available(Vec::default())); | |||
| // If a package has a marker, add a dependency from it to the | |||
| // same package without markers. | |||
There was a problem hiding this comment.
Similar to the comment below, there may be a better way to solve this. I have a feeling we might want a separate PubGrubPackageInner marker type.
There was a problem hiding this comment.
I have that same feeling, especially after you added the Extra variant.
BurntSushi
approved these changes
Jun 5, 2024
zanieb
approved these changes
Jun 5, 2024
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.
Summary
Thankfully this is pretty rare since
pip syncis usually run onpip compileoutput, andpip compilenever outputs markers.Closes #4044