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.

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

Set SYSTEM_VERSION_COMPAT=0 during pip install on macos #1768

Merged
merged 8 commits into from
Mar 11, 2024
Merged

Set SYSTEM_VERSION_COMPAT=0 during pip install on macos #1768

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
115c35a
Set SYSTEM_VERSION_COMPAT=0 during pip install on macos (#1767)
laggykiller Feb 28, 2024
0657d00
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 28, 2024
23efd23
Only set SYSTEM_VERSION_COMPAT=0 for CPython 3.8
laggykiller Feb 28, 2024
ade705d
Set SYSTEM_VERSION_COMPAT=0 for CPython <= 3.8
laggykiller Feb 28, 2024
bfec48a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 28, 2024
cb32fd2
Update cibuildwheel/macos.py
laggykiller Mar 3, 2024
c051094
Update cibuildwheel/macos.py
laggykiller Mar 3, 2024
34a5857
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 3, 2024
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
28 changes: 26 additions & 2 deletions cibuildwheel/macos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,17 +579,41 @@ def build(options: Options, tmp_path: Path) -> None:
shell_with_arch(before_test_prepared, env=virtualenv_env)

# install the wheel
if (
sys.version_info <= (3, 8)
and testing_arch == "x86_64"
and python_arch == "x86_64"
):
laggykiller marked this conversation as resolved.
Show resolved Hide resolved
virtualenv_env_install_wheel = virtualenv_env.copy()
virtualenv_env_install_wheel["SYSTEM_VERSION_COMPAT"] = "0"
log.notice(
unwrap(
"""
Setting SYSTEM_VERSION_COMPAT=0 to ensure x86_64 CPython <= 3.8 on
arm64 runner can get correct macOS version and allow installation
of wheels with MACOSX_DEPLOYMENT_TARGET >= 11.0.
See https://github.com/pypa/cibuildwheel/issues/1767
for the details.
laggykiller marked this conversation as resolved.
Show resolved Hide resolved
"""
)
)
else:
virtualenv_env_install_wheel = virtualenv_env

call_with_arch(
"pip",
"install",
f"{repaired_wheel}{build_options.test_extras}",
env=virtualenv_env,
env=virtualenv_env_install_wheel,
)

# test the wheel
if build_options.test_requires:
call_with_arch(
"pip", "install", *build_options.test_requires, env=virtualenv_env
"pip",
"install",
*build_options.test_requires,
env=virtualenv_env_install_wheel,
)

# run the tests from a temp dir, with an absolute path in the command
Expand Down