Skip to content
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

Fix isolated environment scripts path on Debian #11623

Merged
merged 4 commits into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions news/11623.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix scripts path in isolated build environment on Debian.
7 changes: 2 additions & 5 deletions src/pip/_internal/build_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import sys
import textwrap
from collections import OrderedDict
from sysconfig import get_paths
from types import TracebackType
from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type

Expand All @@ -19,6 +18,7 @@
from pip import __file__ as pip_location
from pip._internal.cli.spinners import open_spinner
from pip._internal.locations import (
get_isolated_environment_bin_path,
get_isolated_environment_lib_paths,
get_platlib,
get_purelib,
Expand All @@ -37,10 +37,7 @@ class _Prefix:
def __init__(self, path: str) -> None:
self.path = path
self.setup = False
self.bin_dir = get_paths(
"nt" if os.name == "nt" else "posix_prefix",
vars={"base": path, "platbase": path},
)["scripts"]
self.bin_dir = get_isolated_environment_bin_path(path)
self.lib_dirs = get_isolated_environment_lib_paths(path)


Expand Down
5 changes: 5 additions & 0 deletions src/pip/_internal/locations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"get_major_minor_version",
"get_platlib",
"get_isolated_environment_lib_paths",
"get_isolated_environment_bin_path",
"get_purelib",
"get_scheme",
"get_src_prefix",
Expand Down Expand Up @@ -526,3 +527,7 @@ def get_isolated_environment_lib_paths(prefix: str) -> List[str]:
_log_context(prefix=prefix)

return old_lib_paths


def get_isolated_environment_bin_path(prefix: str) -> str:
return _sysconfig.get_isolated_environment_bin_path(prefix)
16 changes: 12 additions & 4 deletions src/pip/_internal/locations/_sysconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,18 @@ def get_platlib() -> str:
return sysconfig.get_paths()["platlib"]


def get_isolated_environment_lib_paths(prefix: str) -> typing.Tuple[str, str]:
def _get_isolated_environment_paths(prefix: str) -> typing.Dict[str, str]:
vars = {"base": prefix, "platbase": prefix}
if "venv" in sysconfig.get_scheme_names():
paths = sysconfig.get_paths(vars=vars, scheme="venv")
else:
paths = sysconfig.get_paths(vars=vars)
return sysconfig.get_paths(vars=vars, scheme="venv")
return sysconfig.get_paths(vars=vars)


def get_isolated_environment_lib_paths(prefix: str) -> typing.Tuple[str, str]:
paths = _get_isolated_environment_paths(prefix)
return (paths["purelib"], paths["platlib"])


def get_isolated_environment_bin_path(prefix: str) -> str:
paths = _get_isolated_environment_paths(prefix)
return paths["scripts"]