From d5fa5475d4e8c58000d056f44a9968f68337cf95 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 12 Apr 2017 09:49:38 +0100 Subject: [PATCH] Don't audit or delocate wheels that are dependencies of the package Wheels that are dependencies are also output by `pip wheel`. These can cause auditwheel trouble, and we're not interested in them anyway --- cibuildwheel/linux.py | 2 +- cibuildwheel/macos.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 82bfe07f..9260c4e7 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -54,7 +54,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be "$PYBIN/pip" wheel . -w /tmp/linux_wheels done - for whl in /tmp/linux_wheels/*.whl; do + for whl in /tmp/linux_wheels/{package_name}-*.whl; do auditwheel repair "$whl" -w /output done diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 75d0d4ae..b3e67ef0 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -61,7 +61,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be # build the wheel to temp dir temp_wheel_dir = '/tmp/tmpwheel%s' % config.version shell([pip, 'wheel', project_dir, '-w', temp_wheel_dir], env=env) - temp_wheel = glob(temp_wheel_dir+'/*.whl')[0] + temp_wheel = glob('%s/%s-*.whl' % (temp_wheel_dir, package_name))[0] # list the dependencies shell(['delocate-listdeps', temp_wheel], env=env)