Skip to content

Add use_user_site to RequirementPreparer #7331

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
Nov 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/pip/_internal/cli/req_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ def make_requirement_preparer(
req_tracker, # type: RequirementTracker
session, # type: PipSession
finder, # type: PackageFinder
use_user_site, # type: bool
download_dir=None, # type: str
wheel_download_dir=None, # type: str
):
Expand All @@ -174,6 +175,7 @@ def make_requirement_preparer(
session=session,
finder=finder,
require_hashes=options.require_hashes,
use_user_site=use_user_site,
)

@staticmethod
Expand Down
1 change: 1 addition & 0 deletions src/pip/_internal/commands/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def run(self, options, args):
session=session,
finder=finder,
download_dir=options.download_dir,
use_user_site=False,
)

resolver = self.make_resolver(
Expand Down
1 change: 1 addition & 0 deletions src/pip/_internal/commands/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ def run(self, options, args):
req_tracker=req_tracker,
session=session,
finder=finder,
use_user_site=options.use_user_site,
)
resolver = self.make_resolver(
preparer=preparer,
Expand Down
1 change: 1 addition & 0 deletions src/pip/_internal/commands/wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ def run(self, options, args):
session=session,
finder=finder,
wheel_download_dir=options.wheel_dir,
use_user_site=False,
)

resolver = self.make_resolver(
Expand Down
4 changes: 1 addition & 3 deletions src/pip/_internal/legacy_resolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,7 @@ def _get_abstract_dist_for(self, req):
representing a prepared variant of the same.
"""
if req.editable:
return self.preparer.prepare_editable_requirement(
req, self.use_user_site
)
return self.preparer.prepare_editable_requirement(req)

# satisfied_by is only evaluated by calling _check_skip_installed,
# so it must be None here.
Expand Down
7 changes: 5 additions & 2 deletions src/pip/_internal/operations/prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ def __init__(
session, # type: PipSession
finder, # type: PackageFinder
require_hashes, # type: bool
use_user_site, # type: bool
):
# type: (...) -> None
super(RequirementPreparer, self).__init__()
Expand Down Expand Up @@ -547,6 +548,9 @@ def __init__(
# Should hash-checking be required?
self.require_hashes = require_hashes

# Should install in user site-packages?
self.use_user_site = use_user_site

@property
def _download_should_save(self):
# type: () -> bool
Expand Down Expand Up @@ -682,7 +686,6 @@ def prepare_linked_requirement(
def prepare_editable_requirement(
self,
req, # type: InstallRequirement
use_user_site, # type: bool
):
# type: (...) -> AbstractDistribution
"""Prepare an editable requirement
Expand All @@ -707,7 +710,7 @@ def prepare_editable_requirement(

if self._download_should_save:
req.archive(self.download_dir)
req.check_if_exists(use_user_site)
req.check_if_exists(self.use_user_site)

return abstract_dist

Expand Down
1 change: 1 addition & 0 deletions tests/unit/test_req.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def _basic_resolver(self, finder, require_hashes=False):
session=PipSession(),
finder=finder,
require_hashes=require_hashes,
use_user_site=False,
)
yield Resolver(
preparer=preparer,
Expand Down