Skip to content

Add handling for cross-compilation environments.#231

Merged
vsajip merged 1 commit intopypa:masterfrom
freakboy3742:crossenv-support
Oct 7, 2024
Merged

Add handling for cross-compilation environments.#231
vsajip merged 1 commit intopypa:masterfrom
freakboy3742:crossenv-support

Conversation

@freakboy3742
Copy link
Copy Markdown
Contributor

@freakboy3742 freakboy3742 commented Sep 25, 2024

Adds handling to _build_shebang() that will unconditionally use the "non-simple" shebang if the current environment is marked as a cross-compilation environment.

In cross-compilation environments, the "python interpreter" can be a script that injects environmental modifications. However, these scripts then fail if they're used as a bare shebang, because they're not strictly an executable. The "non-simple" shebang is a workaround for this.

The marker for a cross-compilation environment is the one used by crossenv.

Fixes #230.

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 12.50000% with 14 lines in your changes missing coverage. Please review.

Project coverage is 76.95%. Comparing base (674a491) to head (4a36423).
Report is 5 commits behind head on master.

Files with missing lines Patch % Lines
tests/test_scripts.py 14.28% 12 Missing ⚠️
distlib/scripts.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #231      +/-   ##
==========================================
- Coverage   81.49%   76.95%   -4.55%     
==========================================
  Files          24       24              
  Lines        8885     8865      -20     
  Branches     1747     1630     -117     
==========================================
- Hits         7241     6822     -419     
- Misses       1300     1675     +375     
- Partials      344      368      +24     
Flag Coverage Δ
unittests 76.95% <12.50%> (-3.67%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@freakboy3742
Copy link
Copy Markdown
Contributor Author

Thanks for pushing the button to run CI; AFAICT, the test failures are all due to codecov, and the coverage failure is because codecov rejected the upload. Not sure if there's anything I can do to resolve this one at my end...

@vsajip
Copy link
Copy Markdown
Collaborator

vsajip commented Oct 1, 2024

Don't worry, that Codecov failure will be looked at. Thanks!

@vsajip vsajip merged commit a16423f into pypa:master Oct 7, 2024
@freakboy3742 freakboy3742 deleted the crossenv-support branch October 8, 2024 00:16
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.

Executable script wrappers fail in cross-build environments

2 participants