Skip to content

Find rye pythons with and without install directory #25

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

Merged
frostming merged 1 commit into from
Mar 25, 2024
Merged

Find rye pythons with and without install directory #25

Show file tree
Hide file tree
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
14 changes: 8 additions & 6 deletions src/findpython/providers/rye.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ def find_pythons(self) -> t.Iterable[PythonVersion]:
for child in safe_iter_dir(py_root):
if child.is_symlink(): # registered an existing python
continue
if WINDOWS:
python_bin = child / "install/python.exe"
else:
python_bin = child / "install/bin/python3"
if python_bin.exists():
yield self.version_maker(python_bin, _interpreter=python_bin)
for intermediate in ("", "install/"):
if WINDOWS:
python_bin = child / (intermediate + "python.exe")
else:
python_bin = child / (intermediate + "bin/python3")
if python_bin.exists():
yield self.version_maker(python_bin, _interpreter=python_bin)
break
10 changes: 8 additions & 2 deletions tests/test_posix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,14 @@ def test_find_python_from_rye_provider(mocked_python, tmp_path, monkeypatch):
python310 = mocked_python.add_python(
tmp_path / ".rye/py/cpython@3.10.9/install/bin/python3", "3.10.9"
)
python311 = mocked_python.add_python(
tmp_path / ".rye/py/cpython@3.11.8/bin/python3", "3.11.8"
)
monkeypatch.setenv("HOME", str(tmp_path))

register_provider(RyeProvider)
pythons = Finder(selected_providers=["rye"]).find_all(3, 10)
assert python310 in pythons
find_310 = Finder(selected_providers=["rye"]).find_all(3, 10)
assert python310 in find_310

find_311 = Finder(selected_providers=["rye"]).find_all(3, 11)
assert python311 in find_311