McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Merge pull request #7983 from uranusjr/install-req-editable-type-fix 

Accept InstallRequirement as comes_from
This commit is contained in:
Paul Moore 2020-04-06 14:48:26 +01:00 committed by GitHub
parent eb865b4e10 74c5042052
commit 2b3d0a5cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pip/_internal/req/constructors.py
View File

@ -218,7 +218,7 @@ def parse_req_from_editable(editable_req):
def install_req_from_editable(
editable_req, # type: str
comes_from=None, # type: Optional[str]
comes_from=None, # type: Optional[Union[InstallRequirement, str]]
use_pep517=None, # type: Optional[bool]
isolated=False, # type: bool
options=None, # type: Optional[Dict[str, Any]]
@ -231,7 +231,9 @@ def install_req_from_editable(
source_dir = parts.link.file_path if parts.link.scheme == 'file' else None
return InstallRequirement(
parts.requirement, comes_from, source_dir=source_dir,
parts.requirement,
comes_from=comes_from,
source_dir=source_dir,
editable=True,
link=parts.link,
constraint=constraint,

5
src/pip/_internal/resolution/resolvelib/candidates.py
View File

@ -60,10 +60,7 @@ def make_install_req_from_editable(link, parent):
assert parent.editable, "parent not editable"
return install_req_from_editable(
link.url,
# HACK: install_req_from_editable accepts Optional[str] here, but
# parent.comes_from is Union[str, InstallRequirement, None]. How do
# we fix the type hint conflicts?
comes_from=parent.comes_from, # type: ignore
comes_from=parent.comes_from,
use_pep517=parent.use_pep517,
isolated=parent.isolated,
constraint=parent.constraint,