Add --exclude option to delocate-wheel

[rossant]

Same motivation as pypa/auditwheel#310

I need this to remove libvulkan from the repaired wheel.

[matthew-brett]

Sorry for the delay. Some thoughts. Can you think of a test?

[matthew-brett]

I think you are doing a substring search here? Is that what you intended? Or did you mean

and not name in exclude

?

[HexDecimal]

The substring search by rossant is intentional. The main alternative is to allow RegEx, which is usually overkill.

[matthew-brett]

Or allow multiple --exclude options with action="append"?

[HexDecimal]

I've rewritten the code to use action="append" but I haven't tested it.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (27f7b64) 94.93% compared to head (0442d5c) 95.11%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #106      +/-   ##
==========================================
+ Coverage   94.93%   95.11%   +0.18%     
==========================================
  Files          14       15       +1     
  Lines        1125     1167      +42     
==========================================
+ Hits         1068     1110      +42     
  Misses         57       57              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[matthew-brett]

All looks good - but it still needs some tests - maybe in delocate/tests/test_scripts.py ?

[HexDecimal]

Maybe. I wish the script running tests were using a standard tool rather than ScriptRunner. I'll probably come back to this later.

[matthew-brett]

Yes, I wrote my own script testing framework around 2016, before there were others available - or at least - before I knew there were others available.

[pengzhendong]

Any progress?

[HexDecimal]

Won't merge until tests are made which is a reasonable request. The new tests can use ScriptRunner like the current tests, or pytest-console-scripts which is more standard.

[PhilipGarnero]

Can we merge this please ?
I know it's untested but it's still better than nothing. It's just one click away from being useful to people 🙇‍♂️

[PhilipGarnero]

I took a few minutes to write something that should do ok as a test :

@pytest.mark.xfail(sys.platform != "darwin", reason="Needs macOS linkage.")
def test_fix_wheel_with_excluded_dylibs():
    with InTemporaryDirectory() as tmpdir:
        fixed_wheel, stray_lib = _fixed_wheel(tmpdir)
        _rename_module(fixed_wheel, "module.other", "test.whl")
        shutil.copyfile("test.whl", "test2.whl")
        # We exclude the stray library so it shouldn't be present in the wheel
        code, stdout, stderr = run_command(["delocate-wheel", "-e", "extfunc", "test.whl"])
        with InWheel("test.whl"): 
            dylibs = pjoin("plat_pkg", "fakepkg1", ".dylibs")
            assert_equal(os.listdir(dylibs), [])
        # We exclude a library that does not exist so we should have a normal behavior
        code, stdout, stderr = run_command(["delocate-wheel", "-e", "doesnotexist", "test2.whl"])
        _check_wheel("test2.whl", ".dylibs")

[HexDecimal]

I've added the test and cleaned up the commits. It could be better but now I think it's good enough to merge.

[HexDecimal]

Moved some CLI logic to a shared module so that any new code can apply to both delocate-wheel and delocate-path without having to copy that code across both modules.

[webknjaz]

Moved some CLI logic to a shared module so that any new code can apply to both delocate-wheel and delocate-path without having to copy that code across both modules.

Hey @HexDecimal, I think the changes in this PR may have resulted in breaking the delocate CLI extending a glob-style paths arg: #71 (comment).