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 poetry shell on Windows when using Python installed from msys2 #8644

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Fix poetry shell on Windows when using Python installed from msys2 #8644

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ca3cf3
Fix `poetry shell` on Windows when using Python installed from msys2
ArchGuyWu Nov 9, 2023
5ce820e
Update shell.py
ArchGuyWu Nov 9, 2023
9b516d3
Use pathlib instead of os.path
ArchGuyWu Nov 10, 2023
8a4052f
Merge pull request #2 from ArchGuyWu/ArchGuyWu-patch-3
ArchGuyWu Nov 10, 2023
65e6e49
Update shell.py
ArchGuyWu Nov 10, 2023
6405f20
Merge branch 'master' into ArchGuyWu-patch-2
Secrus Nov 13, 2023
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
8 changes: 7 additions & 1 deletion src/poetry/utils/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = os.path.join(env.path, "Scripts")
ArchGuyWu marked this conversation as resolved.
Show resolved Hide resolved
# 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 os.path.exists(bin_path) else "bin"
else:
bin_dir = "bin"
activate_path = env.path / bin_dir / activate_script

# mypy requires using sys.platform instead of WINDOWS constant
Expand Down
Loading