Merge branch 'master' into remove-fancy-bullets

python-poetry · Nov 13, 2023 · dbc5716 · dbc5716
2 parents 395c8ef + 8d7e55e
commit dbc5716
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/poetry/utils/shell.py b/src/poetry/utils/shell.py
@@ -70,7 +70,13 @@ def get(cls) -> Shell:
 
     def activate(self, env: VirtualEnv) -> int | None:
         activate_script = self._get_activate_script()
-        bin_dir = "Scripts" if WINDOWS else "bin"
+        if WINDOWS:
+            bin_path = env.path / "Scripts"
+            # Python innstalled via msys2 on Windows might produce a POSIX-like venv
+            # See https://github.com/python-poetry/poetry/issues/8638
+            bin_dir = "Scripts" if bin_path.exists() else "bin"
+        else:
+            bin_dir = "bin"
         activate_path = env.path / bin_dir / activate_script
 
         # mypy requires using sys.platform instead of WINDOWS constant