mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Merge pull request #11623 from dnicolodi/debian-scheme
This commit is contained in:
commit
a057c9bc99
4 changed files with 17 additions and 11 deletions
1
news/11623.bugfix.rst
Normal file
1
news/11623.bugfix.rst
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix scripts path in isolated build environment on Debian.
|
|
@ -8,7 +8,6 @@ import site
|
||||||
import sys
|
import sys
|
||||||
import textwrap
|
import textwrap
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
from sysconfig import get_paths
|
|
||||||
from types import TracebackType
|
from types import TracebackType
|
||||||
from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type
|
from typing import TYPE_CHECKING, Iterable, List, Optional, Set, Tuple, Type
|
||||||
|
|
||||||
|
@ -19,6 +18,7 @@ from pip._vendor.packaging.version import Version
|
||||||
from pip import __file__ as pip_location
|
from pip import __file__ as pip_location
|
||||||
from pip._internal.cli.spinners import open_spinner
|
from pip._internal.cli.spinners import open_spinner
|
||||||
from pip._internal.locations import (
|
from pip._internal.locations import (
|
||||||
|
get_isolated_environment_bin_path,
|
||||||
get_isolated_environment_lib_paths,
|
get_isolated_environment_lib_paths,
|
||||||
get_platlib,
|
get_platlib,
|
||||||
get_purelib,
|
get_purelib,
|
||||||
|
@ -37,10 +37,7 @@ class _Prefix:
|
||||||
def __init__(self, path: str) -> None:
|
def __init__(self, path: str) -> None:
|
||||||
self.path = path
|
self.path = path
|
||||||
self.setup = False
|
self.setup = False
|
||||||
self.bin_dir = get_paths(
|
self.bin_dir = get_isolated_environment_bin_path(path)
|
||||||
"nt" if os.name == "nt" else "posix_prefix",
|
|
||||||
vars={"base": path, "platbase": path},
|
|
||||||
)["scripts"]
|
|
||||||
self.lib_dirs = get_isolated_environment_lib_paths(path)
|
self.lib_dirs = get_isolated_environment_lib_paths(path)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -25,9 +25,10 @@ __all__ = [
|
||||||
"USER_CACHE_DIR",
|
"USER_CACHE_DIR",
|
||||||
"get_bin_prefix",
|
"get_bin_prefix",
|
||||||
"get_bin_user",
|
"get_bin_user",
|
||||||
|
"get_isolated_environment_bin_path",
|
||||||
|
"get_isolated_environment_lib_paths",
|
||||||
"get_major_minor_version",
|
"get_major_minor_version",
|
||||||
"get_platlib",
|
"get_platlib",
|
||||||
"get_isolated_environment_lib_paths",
|
|
||||||
"get_purelib",
|
"get_purelib",
|
||||||
"get_scheme",
|
"get_scheme",
|
||||||
"get_src_prefix",
|
"get_src_prefix",
|
||||||
|
@ -526,3 +527,7 @@ def get_isolated_environment_lib_paths(prefix: str) -> List[str]:
|
||||||
_log_context(prefix=prefix)
|
_log_context(prefix=prefix)
|
||||||
|
|
||||||
return old_lib_paths
|
return old_lib_paths
|
||||||
|
|
||||||
|
|
||||||
|
def get_isolated_environment_bin_path(prefix: str) -> str:
|
||||||
|
return _sysconfig.get_isolated_environment_paths(prefix)["scripts"]
|
||||||
|
|
|
@ -213,10 +213,13 @@ def get_platlib() -> str:
|
||||||
return sysconfig.get_paths()["platlib"]
|
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}
|
variables = {"base": prefix, "platbase": prefix}
|
||||||
if "venv" in sysconfig.get_scheme_names():
|
if "venv" in sysconfig.get_scheme_names():
|
||||||
paths = sysconfig.get_paths(vars=vars, scheme="venv")
|
return sysconfig.get_paths(vars=variables, scheme="venv")
|
||||||
else:
|
return sysconfig.get_paths(vars=variables)
|
||||||
paths = 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"])
|
return (paths["purelib"], paths["platlib"])
|
||||||
|
|
Loading…
Reference in a new issue