Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 8 additions & 11 deletions src/ducktools/pythonfinder/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from ducktools.lazyimporter import LazyImporter, ModuleImport, FromImport

from . import list_python_installs, __version__
from .shared import purge_caches
from .shared import purge_caches, version_str_to_tuple


TYPE_CHECKING = False
Expand All @@ -40,6 +40,7 @@
[
ModuleImport("argparse"),
ModuleImport("csv"),
ModuleImport("re"),
ModuleImport("subprocess"),
ModuleImport("sysconfig"),
ModuleImport("platform"),
Expand Down Expand Up @@ -173,11 +174,11 @@ def display_local_installs(
compatible: str | None = None,
) -> None:
if min_ver:
min_ver_tuple = tuple(int(i) for i in min_ver.split("."))
min_ver_tuple = version_str_to_tuple(min_ver)
if max_ver:
max_ver_tuple = tuple(int(i) for i in max_ver.split("."))
max_ver_tuple = version_str_to_tuple(max_ver)
if compatible:
compatible_tuple = tuple(int(i) for i in compatible.split("."))
compatible_spec = _laz.SpecifierSet(f"~={compatible}")

installs = list_python_installs()

Expand All @@ -195,12 +196,8 @@ def display_local_installs(
continue
elif max_ver and install.version > max_ver_tuple:
continue
elif compatible:
if install.version < compatible_tuple:
continue
version_parts = len(compatible) - 1
if install.version[:version_parts] > compatible_tuple[:-1]:
continue
elif compatible and not compatible_spec.contains(install.version_str):
continue

version_str = install.version_str

Expand Down Expand Up @@ -340,7 +337,7 @@ def main() -> int:
display_local_installs()

stop_autoclose()

return 0


Expand Down
Loading