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

Merge remote-tracking branch 'origin/master' into macos-universal2

Browse Source 
# Conflicts:
#	cibuildwheel/macos.py
#	cibuildwheel/util.py
This commit is contained in:
Joe Rickerby
2021-01-06 21:39:32 +00:00
parent e880aca155 9f610d0f5f
commit 9bf5fb10e2
7 changed files with 90 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_test/main_tests/main_platform_test.py
+6 -6
View File
@@ -75,9 +75,9 @@ def test_archs_default(platform, intercepted_build_args, monkeypatch):
build_options = intercepted_build_args.args[0]
if platform == 'linux':
assert build_options.architectures == [Architecture.x86_64, Architecture.i686]
assert build_options.architectures == {Architecture.x86_64, Architecture.i686}
else:
assert build_options.architectures == [Architecture.x86_64]
assert build_options.architectures == {Architecture.x86_64}
@pytest.mark.parametrize('use_env_var', [False, True])
@@ -92,7 +92,7 @@ def test_archs_argument(platform, intercepted_build_args, monkeypatch, use_env_v
main()
build_options = intercepted_build_args.args[0]
assert build_options.architectures == [Architecture.ppc64le]
assert build_options.architectures == {Architecture.ppc64le}
def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
@@ -106,8 +106,8 @@ def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
build_options = intercepted_build_args.args[0]
if platform == 'linux':
assert build_options.architectures == [Architecture.ppc64le]
assert build_options.architectures == {Architecture.ppc64le}
elif platform == 'windows':
assert build_options.architectures == [Architecture.x86]
assert build_options.architectures == {Architecture.x86}
elif platform == 'macos':
assert build_options.architectures == [Architecture.x86_64]
assert build_options.architectures == {Architecture.x86_64}