Skip to content

Commit 3bc3111

Browse files
authored
Add use_user_site to RequirementPreparer (#7331)
2 parents 4b1c348 + 1405a40 commit 3bc3111

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

src/pip/_internal/cli/req_command.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ def make_requirement_preparer(
154154
req_tracker, # type: RequirementTracker
155155
session, # type: PipSession
156156
finder, # type: PackageFinder
157+
use_user_site, # type: bool
157158
download_dir=None, # type: str
158159
wheel_download_dir=None, # type: str
159160
):
@@ -174,6 +175,7 @@ def make_requirement_preparer(
174175
session=session,
175176
finder=finder,
176177
require_hashes=options.require_hashes,
178+
use_user_site=use_user_site,
177179
)
178180

179181
@staticmethod

src/pip/_internal/commands/download.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def run(self, options, args):
132132
session=session,
133133
finder=finder,
134134
download_dir=options.download_dir,
135+
use_user_site=False,
135136
)
136137

137138
resolver = self.make_resolver(

src/pip/_internal/commands/install.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ def run(self, options, args):
361361
req_tracker=req_tracker,
362362
session=session,
363363
finder=finder,
364+
use_user_site=options.use_user_site,
364365
)
365366
resolver = self.make_resolver(
366367
preparer=preparer,

src/pip/_internal/commands/wheel.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ def run(self, options, args):
176176
session=session,
177177
finder=finder,
178178
wheel_download_dir=options.wheel_dir,
179+
use_user_site=False,
179180
)
180181

181182
resolver = self.make_resolver(

src/pip/_internal/legacy_resolve.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,7 @@ def _get_abstract_dist_for(self, req):
269269
representing a prepared variant of the same.
270270
"""
271271
if req.editable:
272-
return self.preparer.prepare_editable_requirement(
273-
req, self.use_user_site
274-
)
272+
return self.preparer.prepare_editable_requirement(req)
275273

276274
# satisfied_by is only evaluated by calling _check_skip_installed,
277275
# so it must be None here.

src/pip/_internal/operations/prepare.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ def __init__(
511511
session, # type: PipSession
512512
finder, # type: PackageFinder
513513
require_hashes, # type: bool
514+
use_user_site, # type: bool
514515
):
515516
# type: (...) -> None
516517
super(RequirementPreparer, self).__init__()
@@ -547,6 +548,9 @@ def __init__(
547548
# Should hash-checking be required?
548549
self.require_hashes = require_hashes
549550

551+
# Should install in user site-packages?
552+
self.use_user_site = use_user_site
553+
550554
@property
551555
def _download_should_save(self):
552556
# type: () -> bool
@@ -682,7 +686,6 @@ def prepare_linked_requirement(
682686
def prepare_editable_requirement(
683687
self,
684688
req, # type: InstallRequirement
685-
use_user_site, # type: bool
686689
):
687690
# type: (...) -> AbstractDistribution
688691
"""Prepare an editable requirement
@@ -707,7 +710,7 @@ def prepare_editable_requirement(
707710

708711
if self._download_should_save:
709712
req.archive(self.download_dir)
710-
req.check_if_exists(use_user_site)
713+
req.check_if_exists(self.use_user_site)
711714

712715
return abstract_dist
713716

tests/unit/test_req.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def _basic_resolver(self, finder, require_hashes=False):
8383
session=PipSession(),
8484
finder=finder,
8585
require_hashes=require_hashes,
86+
use_user_site=False,
8687
)
8788
yield Resolver(
8889
preparer=preparer,

0 commit comments

Comments
 (0)