Skip to content

P
python-poetry
Commit c5fe5171 by Sébastien Eustace
Options

Ensure the correct environment executables are used 

Co-authored-by: finswimmer <2164565+finswimmer@users.noreply.github.com>
parent 66a48130
Showing with 99 additions and 12 deletions
poetry/console/commands/env/info.py
...@@ -33,6 +33,8 @@ class EnvInfoCommand(Command): ...@@ -33,6 +33,8 @@ class EnvInfoCommand(Command):
self._display_complete_info(env) self._display_complete_info(env)
def _display_complete_info(self, env: "Env") -> None: def _display_complete_info(self, env: "Env") -> None:
from poetry.utils.env import GenericEnv
env_python_version = ".".join(str(s) for s in env.version_info[:3]) env_python_version = ".".join(str(s) for s in env.version_info[:3])
self.line("") self.line("")
self.line("<b>Virtualenv</b>") self.line("<b>Virtualenv</b>")
...@@ -44,6 +46,9 @@ class EnvInfoCommand(Command): ...@@ -44,6 +46,9 @@ class EnvInfoCommand(Command):
"<info>Path</info>: <comment>{}</>".format( "<info>Path</info>: <comment>{}</>".format(
env.path if env.is_venv() else "NA" env.path if env.is_venv() else "NA"
), ),
"<info>Executable</info>: <comment>{}</>".format(
env.python if env.is_venv() else "NA"
),
] ]
if env.is_venv(): if env.is_venv():
listing.append( listing.append(
...@@ -55,13 +60,18 @@ class EnvInfoCommand(Command): ...@@ -55,13 +60,18 @@ class EnvInfoCommand(Command):
self.line("") self.line("")
system_env = GenericEnv(env.base)
self.line("<b>System</b>") self.line("<b>System</b>")
self.line( self.line(
"\n".join( "\n".join(
[ [
"<info>Platform</info>: <comment>{}</>".format(env.platform), "<info>Platform</info>: <comment>{}</>".format(env.platform),
"<info>OS</info>: <comment>{}</>".format(env.os), "<info>OS</info>: <comment>{}</>".format(env.os),
"<info>Python</info>: <comment>{}</>".format(env.base), "<info>Python</info>: <comment>{}</>".format(
".".join(str(v) for v in system_env.version_info[:3])
),
"<info>Path</info>: <comment>{}</>".format(system_env.path),
"<info>Executable</info>: <comment>{}</>".format(system_env.python),
] ]
) )
) )
poetry/utils/env.py
...@@ -1061,6 +1061,30 @@ class Env: ...@@ -1061,6 +1061,30 @@ class Env:
self._path = path self._path = path
self._bin_dir = self._path / bin_dir self._bin_dir = self._path / bin_dir
try:
python_executables = sorted(
[
p.name
for p in self._bin_dir.glob("python*")
if re.match(r"python(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
]
)
self._executable = python_executables[0].rstrip(".exe")
except IndexError:
self._executable = "python" + (".exe" if self._is_windows else "")
try:
pip_executables = sorted(
[
p.name
for p in self._bin_dir.glob("pip*")
if re.match(r"pip(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
]
)
self._pip_executable = pip_executables[0].rstrip(".exe")
except IndexError:
self._pip_executable = "pip" + (".exe" if self._is_windows else "")
self._base = base or path self._base = base or path
self._marker_env = None self._marker_env = None
...@@ -1095,7 +1119,7 @@ class Env: ...@@ -1095,7 +1119,7 @@ class Env:
""" """
Path to current python executable Path to current python executable
""" """
return self._bin("python") return self._bin(self._executable)
@property @property
def marker_env(self) -> Dict[str, Any]: def marker_env(self) -> Dict[str, Any]:
...@@ -1121,7 +1145,7 @@ class Env: ...@@ -1121,7 +1145,7 @@ class Env:
Path to current pip executable Path to current pip executable
""" """
# we do not use as_posix() here due to issues with windows pathlib2 implementation # we do not use as_posix() here due to issues with windows pathlib2 implementation
path = self._bin("pip") path = self._bin(self._pip_executable)
if not Path(path).exists(): if not Path(path).exists():
return str(self.pip_embedded) return str(self.pip_embedded)
return path return path
...@@ -1267,7 +1291,7 @@ class Env: ...@@ -1267,7 +1291,7 @@ class Env:
return self._run(cmd, **kwargs) return self._run(cmd, **kwargs)
def run_python_script(self, content: str, **kwargs: Any) -> str: def run_python_script(self, content: str, **kwargs: Any) -> str:
return self.run("python", "-W", "ignore", "-", input_=content, **kwargs) return self.run(self._executable, "-W", "ignore", "-", input_=content, **kwargs)
def _run(self, cmd: List[str], **kwargs: Any) -> Union[int, str]: def _run(self, cmd: List[str], **kwargs: Any) -> Union[int, str]:
""" """
...@@ -1489,7 +1513,10 @@ class VirtualEnv(Env): ...@@ -1489,7 +1513,10 @@ class VirtualEnv(Env):
def get_pip_command(self, embedded: bool = False) -> List[str]: def get_pip_command(self, embedded: bool = False) -> List[str]:
# We're in a virtualenv that is known to be sane, # We're in a virtualenv that is known to be sane,
# so assume that we have a functional pip # so assume that we have a functional pip
return [self._bin("python"), self.pip_embedded if embedded else self.pip] return [
self._bin(self._executable),
self.pip_embedded if embedded else self.pip,
]
def get_supported_tags(self) -> List[Tag]: def get_supported_tags(self) -> List[Tag]:
file_path = Path(packaging.tags.__file__) file_path = Path(packaging.tags.__file__)
...@@ -1607,7 +1634,10 @@ class NullEnv(SystemEnv): ...@@ -1607,7 +1634,10 @@ class NullEnv(SystemEnv):
self.executed = [] self.executed = []
def get_pip_command(self, embedded: bool = False) -> List[str]: def get_pip_command(self, embedded: bool = False) -> List[str]:
return [self._bin("python"), self.pip_embedded if embedded else self.pip] return [
self._bin(self._executable),
self.pip_embedded if embedded else self.pip,
]
def _run(self, cmd: List[str], **kwargs: Any) -> int: def _run(self, cmd: List[str], **kwargs: Any) -> int:
self.executed.append(cmd) self.executed.append(cmd)
......
tests/console/commands/env/test_info.py
import sys
from pathlib import Path from pathlib import Path
import pytest import pytest
from poetry.utils._compat import WINDOWS
from poetry.utils.env import MockEnv from poetry.utils.env import MockEnv
...@@ -28,14 +31,21 @@ Virtualenv ...@@ -28,14 +31,21 @@ Virtualenv
Python: 3.7.0 Python: 3.7.0
Implementation: CPython Implementation: CPython
Path: {prefix} Path: {prefix}
Executable: {executable}
Valid: True Valid: True
System System
Platform: darwin Platform: darwin
OS: posix OS: posix
Python: {base_prefix} Python: {base_version}
Path: {base_prefix}
Executable: {base_executable}
""".format( """.format(
prefix=str(Path("/prefix")), base_prefix=str(Path("/base/prefix")) prefix=str(Path("/prefix")),
base_prefix=str(Path("/base/prefix")),
base_version=".".join(str(v) for v in sys.version_info[:3]),
executable=sys.executable,
base_executable="python" + (".exe" if WINDOWS else ""),
) )
assert expected == tester.io.fetch_output() assert expected == tester.io.fetch_output()
......
tests/utils/test_env.py
...@@ -15,6 +15,7 @@ from cleo.io.null_io import NullIO ...@@ -15,6 +15,7 @@ from cleo.io.null_io import NullIO
from poetry.core.semver.version import Version from poetry.core.semver.version import Version
from poetry.core.toml.file import TOMLFile from poetry.core.toml.file import TOMLFile
from poetry.factory import Factory from poetry.factory import Factory
from poetry.utils._compat import WINDOWS
from poetry.utils.env import GET_BASE_PREFIX from poetry.utils.env import GET_BASE_PREFIX
from poetry.utils.env import EnvCommandError from poetry.utils.env import EnvCommandError
from poetry.utils.env import EnvManager from poetry.utils.env import EnvManager
...@@ -964,3 +965,39 @@ def test_env_system_packages(tmp_path, config): ...@@ -964,3 +965,39 @@ def test_env_system_packages(tmp_path, config):
assert not venv_path.joinpath( assert not venv_path.joinpath(
"lib", "python2.7", "no-global-site-packages.txt" "lib", "python2.7", "no-global-site-packages.txt"
).exists() ).exists()
def test_env_finds_the_correct_executables(tmp_dir, manager):
venv_path = Path(tmp_dir) / "Virtual Env"
manager.build_venv(str(venv_path), with_pip=True)
venv = VirtualEnv(venv_path)
default_executable = expected_executable = "python" + (".exe" if WINDOWS else "")
default_pip_executable = expected_pip_executable = "pip" + (
".exe" if WINDOWS else ""
)
major_executable = "python{}{}".format(
sys.version_info[0], ".exe" if WINDOWS else ""
)
major_pip_executable = "pip{}{}".format(
sys.version_info[0], ".exe" if WINDOWS else ""
)
if (
venv._bin_dir.joinpath(default_executable).exists()
and venv._bin_dir.joinpath(major_executable).exists()
):
venv._bin_dir.joinpath(default_executable).unlink()
expected_executable = major_executable
if (
venv._bin_dir.joinpath(default_pip_executable).exists()
and venv._bin_dir.joinpath(major_pip_executable).exists()
):
venv._bin_dir.joinpath(default_pip_executable).unlink()
expected_pip_executable = major_pip_executable
venv = VirtualEnv(venv_path)
assert Path(venv.python).name == expected_executable
assert Path(venv.pip).name == expected_pip_executable
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment