McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Use req to populate candidate line instead of link

Browse source 
This ensures a candidate built from a "found" link (from e.g. index) is
categorized as specifier-based, not URL-based. This is important to
avoid a specifier-based candidate to be 'pip freeze'-ed in the direct
URL form due to PEP 610 (direct-url.json).
This commit is contained in:
Tzu-ping Chung 2020-04-09 17:33:54 +08:00
parent daff81124a
commit e03614fe6d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pip/_internal/resolution/resolvelib/candidates.py
View file

@ -41,8 +41,12 @@ logger = logging.getLogger(__name__)
def make_install_req_from_link(link, parent):
# type: (Link, InstallRequirement) -> InstallRequirement
assert not parent.editable, "parent is editable"
return install_req_from_line(
link.url,
if parent.req:
line = str(parent.req)
else:
line = link.url
ireq = install_req_from_line(
line,
comes_from=parent.comes_from,
use_pep517=parent.use_pep517,
isolated=parent.isolated,
@ -53,6 +57,10 @@ def make_install_req_from_link(link, parent):
hashes=parent.hash_options
),
)
if ireq.link is None:
ireq.link = link
# TODO: Handle wheel cache resolution.
return ireq
def make_install_req_from_editable(link, parent):