Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change expected_wheels to only expect universal2 when a flag is passed

Browse Source
This commit is contained in:
Joe Rickerby
2022-08-08 18:26:37 +01:00
parent 03c8f5b741
commit ac42f66a72
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_macos_archs.py
+1 -1
View File
@@ -11,7 +11,7 @@ basic_project = test_projects.new_c_project()
ALL_MACOS_WHEELS = { ALL_MACOS_WHEELS = {
*utils.expected_wheels("spam", "0.1.0", machine_arch="x86_64"), *utils.expected_wheels("spam", "0.1.0", machine_arch="x86_64"),
*utils.expected_wheels("spam", "0.1.0", machine_arch="arm64"), *utils.expected_wheels("spam", "0.1.0", machine_arch="arm64", include_universal2=True),
} }
test/utils.py
+8 -7
View File
@@ -116,6 +116,7 @@ def expected_wheels(
macosx_deployment_target="10.9", macosx_deployment_target="10.9",
machine_arch=None, machine_arch=None,
python_abi_tags=None, python_abi_tags=None,
include_universal2=False,
): ):
""" """
Returns a list of expected wheels from a run of cibuildwheel. Returns a list of expected wheels from a run of cibuildwheel.
@@ -199,14 +200,14 @@ def expected_wheels(
arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target( arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target(
macosx_deployment_target macosx_deployment_target
) )
platform_tags = [ platform_tags = [f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64']
f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2',
f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64',
]
else: else:
platform_tags = [ platform_tags = [f'macosx_{macosx_deployment_target.replace(".", "_")}_x86_64']
f'macosx_{macosx_deployment_target.replace(".", "_")}_x86_64',
] if include_universal2:
platform_tags.append(
f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2',
)
else: else:
raise Exception("unsupported platform") raise Exception("unsupported platform")