From 513ef49cd43b4c4d80fcf11afa48cefde8deb784 Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 19 Nov 2019 23:36:20 +0100 Subject: [PATCH] Only build x86_64 / Intel 10.9+ on macOS --- README.md | 14 +++++++------- cibuildwheel/__main__.py | 4 ++-- cibuildwheel/macos.py | 23 ++++++++++++++--------- docs/options.md | 20 ++++++++++---------- test/shared/utils.py | 14 ++++++-------- unit_test/main_options_test.py | 16 ++++++++-------- 6 files changed, 47 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 38d8413c..2989eac2 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,13 @@ Python wheels are great. Building them across **Mac, Linux, Windows**, on **mult What does it do? ---------------- -| | macOS 10.6+ intel | macOS 10.9+ x86_64 | manylinux i686 | manylinux x86_64 | Windows 32bit | Windows 64bit | -|---|---|---|---|---|---|---| -| Python 2.7 | ✅ | | ✅ | ✅ | ✅¹ | ✅¹ | -| Python 3.5 | ✅ | | ✅ | ✅ | ✅ | ✅ | -| Python 3.6 | ✅ | | ✅ | ✅ | ✅ | ✅ | -| Python 3.7 | ✅ | | ✅ | ✅ | ✅ | ✅ | -| Python 3.8 | | ✅ | ✅ | ✅ | ✅ | ✅ | +| | macOS 10.9+ x86_64 | manylinux i686 | manylinux x86_64 | Windows 32bit | Windows 64bit | +|---|---|---|---|---|---| +| Python 2.7 | ✅ | ✅ | ✅ | ✅¹ | ✅¹ | +| Python 3.5 | ✅ | ✅ | ✅ | ✅ | ✅ | +| Python 3.6 | ✅ | ✅ | ✅ | ✅ | ✅ | +| Python 3.7 | ✅ | ✅ | ✅ | ✅ | ✅ | +| Python 3.8 | ✅ | ✅ | ✅ | ✅ | ✅ | > ¹ Not supported on Travis diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 9b3db905..e4a1b016 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -61,7 +61,7 @@ def main(): args = parser.parse_args() detect_obsolete_options() - + if args.platform != 'auto': platform = args.platform else: @@ -97,7 +97,7 @@ def main(): if platform == 'linux': repair_command_default = 'auditwheel repair -w {dest_dir} {wheel}' elif platform == 'macos': - repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} {wheel}' + repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel --require-archs x86_64 -w {dest_dir} {wheel}' else: repair_command_default = '' repair_command = get_option_from_environment('CIBW_REPAIR_WHEEL_COMMAND', platform=platform, default=repair_command_default) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index d7a50d0c..c137da8a 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -14,11 +14,11 @@ from .util import prepare_command, get_build_verbosity_extra_flags def get_python_configurations(build_selector): PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url']) python_configurations = [ - PythonConfiguration(version='2.7', identifier='cp27-macosx_intel', url='https://www.python.org/ftp/python/2.7.17/python-2.7.17-macosx10.6.pkg'), - PythonConfiguration(version='3.5', identifier='cp35-macosx_intel', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'), - PythonConfiguration(version='3.6', identifier='cp36-macosx_intel', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.6.pkg'), - PythonConfiguration(version='3.7', identifier='cp37-macosx_intel', url='https://www.python.org/ftp/python/3.7.5/python-3.7.5-macosx10.6.pkg'), - PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.0/python-3.8.0-macosx10.9.pkg'), + PythonConfiguration(version='2.7', identifier='cp27-macosx_x86_64', url='https://www.python.org/ftp/python/2.7.17/python-2.7.17-macosx10.9.pkg'), + PythonConfiguration(version='3.5', identifier='cp35-macosx_x86_64', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'), + PythonConfiguration(version='3.6', identifier='cp36-macosx_x86_64', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg'), + PythonConfiguration(version='3.7', identifier='cp37-macosx_x86_64', url='https://www.python.org/ftp/python/3.7.6/python-3.7.6-macosx10.9.pkg'), + PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.1/python-3.8.1-macosx10.9.pkg'), ] # skip builds as required @@ -32,6 +32,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef repaired_wheel_dir = os.path.join(temp_dir, 'repaired_wheel') python_configurations = get_python_configurations(build_selector) + get_pip_url = 'https://bootstrap.pypa.io/get-pip.py' get_pip_script = '/tmp/get-pip.py' @@ -50,20 +51,19 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef return subprocess.check_call(args, env=env, cwd=cwd, shell=shell) # get latest pip once and for all - - call(['curl', '-L', '--retry', '3', '--retry-delay', '3', '-o', get_pip_script, get_pip_url]) + call(['curl', '--retry', '3', '--retry-delay', '3', '-sSLo', get_pip_script, get_pip_url]) for config in python_configurations: # if this version of python isn't installed, get it from python.org and install python_package_identifier = 'org.python.Python.PythonFramework-%s' % config.version if python_package_identifier not in installed_system_packages: # download the pkg - call(['curl', '-L', '-o', '/tmp/Python.pkg', config.url]) + call(['curl', '--retry', '3', '--retry-delay', '3', '-sSLo', '/tmp/Python.pkg', config.url]) # install call(['sudo', 'installer', '-pkg', '/tmp/Python.pkg', '-target', '/']) # patch open ssl if config.version == '3.5': - call(['curl', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.0.2t/patch-macos-python-%s-openssl-v1.0.2t.tar.gz' % config.version]) + call(['curl', '--retry', '3', '--retry-delay', '3', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.0.2t/patch-macos-python-%s-openssl-v1.0.2t.tar.gz' % config.version]) call(['sudo', 'tar', '-C', '/Library/Frameworks/Python.framework/Versions/%s/' % config.version, '-xmf', '/tmp/python-patch.tar.gz']) installation_bin_path = '/Library/Frameworks/Python.framework/Versions/{}/bin'.format(config.version) @@ -98,6 +98,11 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef call(['pip', '--version'], env=env) call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate'], env=env) + # setup target platform, only required for python 3.5 + if config.version == '3.5': + env['_PYTHON_HOST_PLATFORM'] = 'macosx-10.9-x86_64' # cross-compilation platform override + env['ARCHFLAGS'] = '-arch x86_64' # https://github.com/python/cpython/blob/a5ed2fe0eedefa1649aa93ee74a0bafc8e628a10/Lib/_osx_support.py#L260 + # run the before_build command if before_build: before_build_prepared = prepare_command(before_build, project=abs_project_dir) diff --git a/docs/options.md b/docs/options.md index 52433586..82c1f435 100644 --- a/docs/options.md +++ b/docs/options.md @@ -64,7 +64,7 @@ This option can also be set using the command-line option `--platform`. > Choose the Python versions to build -Space-separated list of builds to build and skip. Each build has an identifier like `cp27-manylinux_x86_64` or `cp35-macosx_intel` - you can list specific ones to build and `cibuildwheel` will only build those, and/or list ones to skip and `cibuildwheel` won't try to build them. +Space-separated list of builds to build and skip. Each build has an identifier like `cp27-manylinux_x86_64` or `cp35-macosx_x86_64` - you can list specific ones to build and `cibuildwheel` will only build those, and/or list ones to skip and `cibuildwheel` won't try to build them. When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built. @@ -72,13 +72,13 @@ When setting the options, you can use shell-style globbing syntax (as per `fnmat
-| | macOS 64bit | macOS 32/64bit | Manylinux 64bit | Manylinux 32bit | Windows 64bit | Windows 32bit | -|------------|---------------------|--------------------|------------------------|----------------------|-----------------|----------------| -| Python 2.7 | | cp27-macosx_intel | cp27-manylinux_x86_64 | cp27-manylinux_i686 | cp27-win_amd64 | cp27-win32 | -| Python 3.5 | | cp35-macosx_intel | cp35-manylinux_x86_64 | cp35-manylinux_i686 | cp35-win_amd64 | cp35-win32 | -| Python 3.6 | | cp36-macosx_intel | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | -| Python 3.7 | | cp37-macosx_intel | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | -| Python 3.8 | cp38-macosx_x86_64 | | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | +| | macOS 64bit | Manylinux 64bit | Manylinux 32bit | Windows 64bit | Windows 32bit | +|------------|--------------------|------------------------|----------------------|-----------------|----------------| +| Python 2.7 | cp27-macosx_x86_64 | cp27-manylinux_x86_64 | cp27-manylinux_i686 | cp27-win_amd64 | cp27-win32 | +| Python 3.5 | cp35-macosx_x86_64 | cp35-manylinux_x86_64 | cp35-manylinux_i686 | cp35-win_amd64 | cp35-win32 | +| Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | +| Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | +| Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to `cibuildwheel`. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). @@ -90,7 +90,7 @@ The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425] CIBW_BUILD: cp36-* # Skip building on Python 2.7 on the Mac -CIBW_SKIP: cp27-macosx_intel +CIBW_SKIP: cp27-macosx_x86_64 # Skip building on Python 3.8 on the Mac CIBW_SKIP: cp38-macosx_x86_64 @@ -208,7 +208,7 @@ CIBW_BEFORE_BUILD: yum install -y libffi-dev && pip install . Default: - on Linux: `'auditwheel repair -w {dest_dir} {wheel}'` -- on macOS: `'delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} {wheel}'` +- on macOS: `'delocate-listdeps {wheel} && delocate-wheel --require-archs x86_64 -w {dest_dir} {wheel}'` - on Windows: `''` A shell command to repair a built wheel by copying external library dependencies into the wheel tree and relinking them. diff --git a/test/shared/utils.py b/test/shared/utils.py index 9ed730ff..09923326 100644 --- a/test/shared/utils.py +++ b/test/shared/utils.py @@ -86,22 +86,20 @@ def expected_wheels(package_name, package_version, manylinux_versions=['manylinu platform_tags.append('{manylinux_version}_{architecture}'.format( manylinux_version=manylinux_version, architecture=architecture )) - + def get_platform_tags(python_abi_tag): return platform_tags - + elif platform == 'windows': def get_platform_tags(python_abi_tag): return ['win32', 'win_amd64'] - + elif platform == 'macos': - + def get_platform_tags(python_abi_tag): - if python_abi_tag == 'cp38-cp38': - return ['macosx_' + (macosx_deployment_target or "10.9").replace(".", "_") + '_x86_64'] - else: - return ['macosx_' + (macosx_deployment_target or "10.6").replace(".", "_") + '_intel'] + return ['macosx_' + (macosx_deployment_target or "10.9").replace(".", "_") + '_x86_64'] + else: raise Exception('unsupported platform') diff --git a/unit_test/main_options_test.py b/unit_test/main_options_test.py index 90935fe8..ece86fce 100644 --- a/unit_test/main_options_test.py +++ b/unit_test/main_options_test.py @@ -50,7 +50,7 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch): monkeypatch.setenv('CIBW_SKIP', SKIP) main() - + intercepted_build_selector = intercepted_build_args.kwargs['build_selector'] assert isinstance(intercepted_build_selector, BuildSelector) assert intercepted_build_selector('build-this') @@ -60,12 +60,12 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch): @pytest.mark.parametrize('architecture, image, full_image', [ - ('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64'), + ('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64'), ('x86_64', 'manylinux1', 'quay.io/pypa/manylinux1_x86_64'), ('x86_64', 'manylinux2010', 'quay.io/pypa/manylinux2010_x86_64'), ('x86_64', 'manylinux2014', 'quay.io/pypa/manylinux2014_x86_64'), ('x86_64', 'custom_image', 'custom_image'), - ('i686', None, 'quay.io/pypa/manylinux2010_i686'), + ('i686', None, 'quay.io/pypa/manylinux2010_i686'), ('i686', 'manylinux1', 'quay.io/pypa/manylinux1_i686'), ('i686', 'manylinux2010', 'quay.io/pypa/manylinux2010_i686'), ('i686', 'manylinux2014', 'quay.io/pypa/manylinux2014_i686'), @@ -87,7 +87,7 @@ def get_default_repair_command(platform): if platform == 'linux': return 'auditwheel repair -w {dest_dir} {wheel}' elif platform == 'macos': - return 'delocate-listdeps {wheel} && delocate-wheel -w {dest_dir} {wheel}' + return 'delocate-listdeps {wheel} && delocate-wheel --require-archs x86_64 -w {dest_dir} {wheel}' elif platform == 'windows': return '' else: @@ -139,9 +139,9 @@ def test_test_requires(test_requires, platform_specific, platform, intercepted_b monkeypatch.setenv('CIBW_TEST_REQUIRES', 'overwritten') else: monkeypatch.setenv('CIBW_TEST_REQUIRES', test_requires) - + main() - + assert intercepted_build_args.kwargs['test_requires'] == (test_requires or '').split() @@ -154,9 +154,9 @@ def test_test_extras(test_extras, platform_specific, platform, intercepted_build monkeypatch.setenv('CIBW_TEST_EXTRAS', 'overwritten') else: monkeypatch.setenv('CIBW_TEST_EXTRAS', test_extras) - + main() - + assert intercepted_build_args.kwargs['test_extras'] == ('[' + test_extras + ']' if test_extras else '')