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.

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

[Fix] Wheel pip regressions #656

Merged
merged 14 commits into from
Jul 10, 2019
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix(rez-pip): ensure only the bin scripts are set as tools
The current check if a file is executable or not seems to be causing
some issues on Windows platform adding non executable files to the
tools list in the package.py. Add a further check that ensures the
executable script file is located in the bin folder.

Relates: ef14e91
  • Loading branch information
lambdaclan committed Jun 28, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit a629e508b9e82b9b908525d7271c06884d7443d9
2 changes: 1 addition & 1 deletion src/rez/pip.py
Original file line number Diff line number Diff line change
@@ -411,7 +411,7 @@ def pip_install_package(source_name, pip_version=None, python_version=None,
destination_file = os.path.relpath(source_file, stagingdir)
exe = False

if is_exe(source_file):
if is_exe(source_file) and destination_file.startswith("bin"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"bin" + os.sep?

_file = os.path.basename(destination_file)
tools.append(_file)
exe = True