Skip to content

Loosen entry point checking to support non-wrapped executables #13

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
amjith merged 2 commits into from
Mar 16, 2023
Merged

Loosen entry point checking to support non-wrapped executables #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b5c9f5
Loosen entry point checking to support non-wrapped executables
Mar 16, 2023
8ee9185
Trust pip show -f, don't double-check
Mar 16, 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
18 changes: 2 additions & 16 deletions src/pickley/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self, venv):
self.files = None
self.info = {}
name = venv.pspec.dashed
if runez.DRYRUN and not venv.is_venv_exe("bin/pip"):
if runez.DRYRUN and not runez.is_executable("bin/pip"):
self.bin.files = {venv.pspec.dashed: "dryrun"} # Pretend an entry point exists in dryrun mode
return

Expand Down Expand Up @@ -84,7 +84,7 @@ def __init__(self, venv):
if "_completer" in basename:
self.completers.add_file(path)

elif venv.is_venv_exe(path):
elif runez.is_executable(path):
self.bin.add_file(path)

elif dirname.endswith(".dist-info"):
Expand Down Expand Up @@ -210,20 +210,6 @@ def bin_path(self, name, try_variant=False):
if os.path.exists(path):
return path

def is_venv_exe(self, path):
"""
Args:
path (str): Path to file to examine

Returns:
(bool): True if 'path' points to a python executable part of this venv
"""
if runez.is_executable(path):
for line in runez.readlines(path, first=1):
if line.startswith("#!"):
if path.startswith(self.folder):
return True

def pip_install(self, *args):
"""Allows to not forget to state the -i index..."""
r = self.run_pip("install", "-i", self.pspec.index, *args, fatal=False)
Expand Down