Skip to content

Fix direct URL by always passing the template’s URL values into candidate #8378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 4, 2020

Conversation

uranusjr
Copy link
Member

@uranusjr uranusjr commented Jun 2, 2020

Should fix test_install_vcs_non_editable_direct_url, but this must not break any passing tests…

uranusjr added 2 commits June 2, 2020 19:07
We need to set the original link so the value is accessible in later
code, when we return the ireq backing the candidate. This is needed for
some parts of the post processing like PEP 610 support, which needs to
record the original, remote URL, not the potentially hit cache link.
@uranusjr uranusjr added skip news Does not need a NEWS file entry (eg: trivial changes) C: new resolver labels Jun 2, 2020
@uranusjr
Copy link
Member Author

uranusjr commented Jun 2, 2020

This seems to work.

@uranusjr uranusjr marked this pull request as ready for review June 2, 2020 11:46
@uranusjr uranusjr requested review from pfmoore and pradyunsg June 2, 2020 11:46
Copy link
Member

@sbidoul sbidoul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on a 200 lines frozen requirements.txt with a mix of VCS URL and == requirements.
VCS wheel cache and direct URL seem to work. 👍 🎉

(time new resolver / time old resolver) ~= 1.6, and, as expected, same time with --no-deps.

@pfmoore
Copy link
Member

pfmoore commented Jun 4, 2020

@pradyunsg Do you want to review this, or should I merge it?

@pradyunsg
Copy link
Member

Go ahead. I don't think I'll be able to take a look today.

@pfmoore pfmoore merged commit d3ce025 into pypa:master Jun 4, 2020
@uranusjr uranusjr deleted the direct-url-fix branch June 10, 2020 06:40
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
skip news Does not need a NEWS file entry (eg: trivial changes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants