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.

Sign up for GitHub

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

Jump to bottom

Fix: conda environment is detected as broken (#4566) #5007

Merged
merged 1 commit into from
Jan 17, 2022
Merged

Fix: conda environment is detected as broken (#4566) #5007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions src/poetry/utils/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,7 @@ class Env:
def __init__(self, path: Path, base: Optional[Path] = None) -> None:
self._is_windows = sys.platform == "win32"
self._is_mingw = sysconfig.get_platform().startswith("mingw")
self._is_conda = bool(os.environ.get("CONDA_DEFAULT_ENV"))

if not self._is_windows or self._is_mingw:
bin_dir = "bin"
Expand Down Expand Up @@ -1133,10 +1134,15 @@ def marker_env(self) -> Dict[str, Any]:
def parent_env(self) -> "GenericEnv":
return GenericEnv(self.base, child_env=self)

def find_executables(self) -> None:
def _find_python_executable(self) -> None:
bin_dir = self._bin_dir

if self._is_windows and self._is_conda:
bin_dir = self._path

python_executables = sorted(
p.name
for p in self._bin_dir.glob("python*")
for p in bin_dir.glob("python*")
if re.match(r"python(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
)
if python_executables:
Expand All @@ -1146,6 +1152,7 @@ def find_executables(self) -> None:

self._executable = executable

def _find_pip_executable(self) -> None:
pip_executables = sorted(
p.name
for p in self._bin_dir.glob("pip*")
Expand All @@ -1158,6 +1165,10 @@ def find_executables(self) -> None:

self._pip_executable = pip_executable

def find_executables(self) -> None:
self._find_python_executable()
self._find_pip_executable()

def get_embedded_wheel(self, distribution: str) -> Path:
return get_embed_wheel(
distribution, f"{self.version_info[0]}.{self.version_info[1]}"
Expand Down Expand Up @@ -1402,7 +1413,7 @@ def _bin(self, bin: str) -> str:
# the root of the env path.
if self._is_windows:
if not bin.endswith(".exe"):
bin_path = self._bin_dir / (bin + ".exe")
bin_path = self._path / (bin + ".exe")
else:
bin_path = self._path / bin

Expand Down