From 95caaeb8ec8b2e358fe1eb50d5a61924c3b7ffc0 Mon Sep 17 00:00:00 2001
From: finswimmer <finswimmer77@gmail.com>
Date: Sat, 8 Jan 2022 17:04:26 +0100
Subject: [PATCH] add alternative bin search path in case of conda env under
 windows

---
 poetry/utils/env.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/poetry/utils/env.py b/poetry/utils/env.py
index 061d67ede6d..0b91aa22395 100644
--- a/poetry/utils/env.py
+++ b/poetry/utils/env.py
@@ -924,11 +924,13 @@ class Env(object):
     def __init__(self, path, base=None):  # type: (Path, Optional[Path]) -> 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"
         else:
             bin_dir = "Scripts"
+
         self._path = path
         self._bin_dir = self._path / bin_dir
 
@@ -1079,13 +1081,16 @@ def get_base_prefix(cls):  # type: () -> str
 
         return sys.prefix
 
-    def find_executables(self):  # type: () -> None
+    def _find_python_executable(self):  # type: () -> 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*")
-                if re.match(r"python(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
-            ]
+            p.name
+            for p in bin_dir.glob("python*")
+            if re.match(r"python(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
         )
         if python_executables:
             executable = python_executables[0]
@@ -1094,12 +1099,11 @@ def find_executables(self):  # type: () -> None
 
             self._executable = executable
 
+    def _find_pip_executable(self):  # type: () -> None
         pip_executables = sorted(
-            [
-                p.name
-                for p in self._bin_dir.glob("pip*")
-                if re.match(r"pip(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
-            ]
+            p.name
+            for p in self._bin_dir.glob("pip*")
+            if re.match(r"pip(?:\d+(?:\.\d+)?)?(?:\.exe)?$", p.name)
         )
         if pip_executables:
             pip_executable = pip_executables[0]
@@ -1108,6 +1112,10 @@ def find_executables(self):  # type: () -> None
 
             self._pip_executable = pip_executable
 
+    def find_executables(self):  # type: () -> None
+        self._find_python_executable()
+        self._find_pip_executable()
+
     def get_version_info(self):  # type: () -> Tuple[int]
         raise NotImplementedError()
 
@@ -1235,7 +1243,7 @@ def _bin(self, bin):  # type: (str) -> str
             # a base Python install.
             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