Merge pull request #255 from lkollar/strip

Add --strip option to 'repair'

Author: lkollar

auditwheel/main_repair.py

@@ -42,6 +42,11 @@ def configure_parser(sub_parsers):
                    help=('Do not update the wheel filename tags and WHEEL info'
                          ' to match the repaired platform tag.'),
                    default=True)
+    p.add_argument('--strip',
+                   dest='STRIP',
+                   action='store_true',
+                   help='Strip symbols in the resulting wheel',
+                   default=False)
     p.set_defaults(func=execute)
 
 
@@ -86,7 +91,8 @@ def execute(args, p):
                              lib_sdir=args.LIB_SDIR,
                              out_dir=args.WHEEL_DIR,
                              update_tags=args.UPDATE_TAGS,
-                             patcher=patcher)
+                             patcher=patcher,
+                             strip=args.STRIP)
 
     if out_wheel is not None:
         analyzed_tag = analyze_wheel_abi(out_wheel).overall_tag

auditwheel/repair.py

@@ -8,6 +8,7 @@
 from collections import OrderedDict
 from os.path import exists, basename, abspath, isabs, dirname
 from os.path import join as pjoin
+from subprocess import check_call
 from typing import Dict, Optional, Tuple
 
 from auditwheel.patcher import ElfPatcher
@@ -28,7 +29,8 @@
 
 
 def repair_wheel(wheel_path: str, abi: str, lib_sdir: str, out_dir: str,
-                 update_tags: bool, patcher: ElfPatcher) -> Optional[str]:
+                 update_tags: bool, patcher: ElfPatcher,
+                 strip: bool = False) -> Optional[str]:
 
     external_refs_by_fn = get_wheel_elfdata(wheel_path)[1]
 
@@ -88,9 +90,21 @@ def repair_wheel(wheel_path: str, abi: str, lib_sdir: str, out_dir: str,
         if update_tags:
             ctx.out_wheel = add_platforms(ctx, [abi],
                                           get_replace_platforms(abi))
+
+        if strip:
+            libs_to_strip = [path for (_, path) in soname_map.values()]
+            extensions = external_refs_by_fn.keys()
+            strip_symbols(itertools.chain(libs_to_strip, extensions))
+
     return ctx.out_wheel
 
 
+def strip_symbols(libraries):
+    for lib in libraries:
+        logger.info('Stripping symbols from %s', lib)
+        check_call(['strip', '-s', lib])
+
+
 def copylib(src_path, dest_dir, patcher):
     """Graft a shared library from the system into the wheel and update the
     relevant links.

tests/integration/sample_extension/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools >= 45.0.0", "cython"]
+build-backend = "setuptools.build_meta"

tests/integration/sample_extension/setup.py

@@ -0,0 +1,8 @@
+from setuptools import setup
+from Cython.Build import cythonize
+
+setup(
+    name="sample_extension",
+    version="0.1.0",
+    ext_modules=cythonize("src/sample_extension.pyx")
+)

tests/integration/sample_extension/src/sample_extension.pyx

@@ -0,0 +1,5 @@
+def test_func(x):
+    return _test_func(x)
+
+cdef _test_func(x):
+    return x + 1

tests/integration/test_manylinux.py

@@ -1,3 +1,4 @@
+import glob
 from contextlib import contextmanager
 import docker
 from subprocess import CalledProcessError
@@ -650,3 +651,32 @@ def test_build_repair_wheel_with_internal_rpath(any_manylinux_container, docker_
                 )
                 for name in w.namelist()
             )
+
+
+def test_strip_wheel(any_manylinux_container, docker_python, io_folder):
+    policy, manylinux_ctr = any_manylinux_container
+    docker_exec(
+        manylinux_ctr,
+        ['bash', '-c', 'cd /auditwheel_src/tests/integration/sample_extension '
+                       '&& python -m pip wheel --no-deps -w /io .']
+    )
+
+    orig_wheel, *_ = os.listdir(io_folder)
+    assert orig_wheel.startswith("sample_extension-0.1.0")
+
+    # Repair the wheel using the appropriate manylinux container
+    repair_command = (
+        'auditwheel repair --plat {policy} --strip -w /io /io/{orig_wheel}'
+    ).format(policy=policy, orig_wheel=orig_wheel)
+    docker_exec(manylinux_ctr, repair_command)
+
+    repaired_wheel, *_ = glob.glob("{io_folder}/*{policy}*.whl".format(
+        io_folder=io_folder, policy=policy))
+    repaired_wheel = os.path.basename(repaired_wheel)
+
+    docker_exec(docker_python, "pip install /io/" + repaired_wheel)
+    output = docker_exec(
+        docker_python,
+        ["python", "-c", "from sample_extension import test_func; print(test_func(1))"]
+    )
+    assert output.strip() == "2"