Visit proxy packages eagerly #10441
Merged
Visit proxy packages eagerly #10441
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
Jan 9, 2025
| @@ -80,6 +82,7 @@ impl PubGrubPriorities { | |||
| let priority = if urls.get(name).is_some() { | |||
| PubGrubPriority::DirectUrl(Reverse(next)) | |||
| } else if version.as_singleton().is_some() { | |||
| // TODO(charlie): Take local version ranges into account (e.g., `[2.0, 2.0+[max])`). | |||
There was a problem hiding this comment.
I'll fix this separately, but this fix alone does not resolve the bug in the linked issue.
|
The error message changes seem... ok. The transformers ecosystem change is surprising. |
charliermarsh
force-pushed
the
charlie/prox
branch
from
6c67390 to
da1359e
Compare
|
Ok, think I fixed that regression. |
charliermarsh
force-pushed
the
charlie/prox
branch
from
da1359e to
5ee783b
Compare
|
I have a hunch that this will actually improve performance and lead to better resolutions. |
konstin
approved these changes
Jan 9, 2025
| @@ -224,6 +227,9 @@ pub(crate) enum PubGrubPriority { | |||
| /// [`ForkUrls`]. | |||
| DirectUrl(Reverse<usize>), | |||
|
|
|||
| /// The package is a proxy package. | |||
There was a problem hiding this comment.
Can you expand this by saying something like:
We process these first since each proxy package expands into two regular
PubGrubPackagepackages, which give us additional constraints, while not changing the priorities since the materialized packages are of the same package name.
It took me a while to get why this was safe to do.
charliermarsh
force-pushed
the
charlie/prox
branch
from
5ee783b to
a8b066a
Compare
zanieb
approved these changes
Jan 9, 2025
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
The issue here is that we add
urllib3{python_full_version >= '3.8'}as a dependency, thenrequests{python_full_version >= '3.8'}, which addsurllib3, but at that point, we haven't expandedurllib3{python_full_version >= '3.8'}, so we "lose" the singleton constraint. The solution is to ensure that we visit proxies eagerly, so that we accumulate constraints as early as possible.Closes #10425 (comment).