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

Smarter detection of binary files during delocate-merge #236

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

HexDecimal
Copy link
Collaborator

@HexDecimal HexDecimal commented Jan 3, 2025

Updates merging to automatically detect binary files and removes the older behavior. This handles the common case of binary files having no suffix. Fixes #228

Using _is_macho_file has false negatives. Instead, all files are passed to the lipo command and its return code is used to determine if the file was valid to be merged. This might have it's own issues, but I'd need to completely rewrite lipo_fuse to make it graceful.

The lib_exts parameter of fuse_trees is now ignored and I intend for it to be removed completely later.

This reuses old tests instead of trying to keep the old behavior. Updating the tests now could conflict with PR #234.

Pull Request Checklist

  • Read and follow the CONTRIBUTING.md guide
  • Mentioned relevant issues
  • Append public facing changes to Changelog.md
  • Ensure new features are covered by tests
  • Ensure fixes are verified by tests

Updates merging to use `lipo` to detect binary files and
removes the previous less reliable behavior.
This handles the common case of binary files having no suffix.

Reusing old tests instead of trying to keep the old behavior.

Fuse wheels tests requires lipo
Copy link

codecov bot commented Jan 3, 2025

Codecov Report

Attention: Patch coverage is 94.73684% with 1 line in your changes missing coverage. Please review.

Project coverage is 97.11%. Comparing base (9169a66) to head (2076dfd).

Files with missing lines Patch % Lines
delocate/fuse.py 94.73% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #236      +/-   ##
==========================================
- Coverage   97.18%   97.11%   -0.07%     
==========================================
  Files          16       16              
  Lines        1350     1354       +4     
==========================================
+ Hits         1312     1315       +3     
- Misses         38       39       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

delocate-merge does not merge Qt Framework binaries
1 participant