auditwheel-emscripten 0.1.0__tar.gz → 0.2.0__tar.gz

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 exclude: (^auditwheel_emscripten/emscripten_tools/)
 default_language_version:
-  python: "3.12"
+  python: "3.13"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: "v5.0.0"

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/CHANGELOG.md

@@ -7,26 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- The output format of `pyodide auditwheel show` has been simplified to be more `ldd`-like. It also shows the location of the dependencies in the wheel
+  using the runtime path of the shared libraries.
+
+- `pyodide auditwheel show` now accepts `-r`, `--with-runtime-paths` option to show the runtime paths of the shared libraries in the wheel.
+
+- `auditwheel.show()` function now returns the runtime paths of the shared libraries in the wheel as well.
+
 ## [0.1.0] - 2025-04-04
 
 ### Changed
 
 - `auditwheel repair` command now updates the DYLINK RPATH section of the wasm module.
-  ([#41](https://github.com/ryanking13/auditwheel-emscripten/pull/41))
+  ([#41](https://github.com/pyodide/auditwheel-emscripten/pull/41))
 
 ## [0.0.16] - 2024-07-05
 
 ### Fixed
 
 - Fixed incorrect extra dependency for typer
-  ([#32](https://github.com/ryanking13/auditwheel-emscripten/pull/32))
+  ([#32](https://github.com/pyodide/auditwheel-emscripten/pull/32))
 
 ## [0.0.15] - 2024-06-17
 
 ### Fixed
 
 - Support Pyodide>=0.26.0 wheels that has "pyodide" platform tag.
-  ([#31](https://github.com/ryanking13/auditwheel-emscripten/pull/31))
+  ([#31](https://github.com/pyodide/auditwheel-emscripten/pull/31))
 
 ## [0.0.14] - 2023-12-23
 
@@ -35,19 +44,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed the behavior of the `repair` command. It does not update `needed` section anymore
   and only copies the shared libraries to the wheel.
   Also, `copy` command is deprecated in favor of `repair`.
-  ([#25](https://github.com/ryanking13/auditwheel-emscripten/pull/25))
+  ([#25](https://github.com/pyodide/auditwheel-emscripten/pull/25))
 
 ## [0.0.13] - 2023.06.08
 
 - Added py.typed file.
-  ([#16](https://github.com/ryanking13/auditwheel-emscripten/pull/16))
+  ([#16](https://github.com/pyodide/auditwheel-emscripten/pull/16))
 
 ## [0.0.12] - 2023.02.13
 
 ### Fixed
 
 - Added license file to the distribution.
-  ([#10](https://github.com/ryanking13/auditwheel-emscripten/pull/10))
+  ([#10](https://github.com/pyodide/auditwheel-emscripten/pull/10))
 
 ## [0.0.11] - 2023.02.06
 
@@ -55,26 +64,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added `--show-type` option to `exports` and `imports` command, which will
   show the type of the functions in the output.
-  ([#9](https://github.com/ryanking13/auditwheel-emscripten/pull/9))
+  ([#9](https://github.com/pyodide/auditwheel-emscripten/pull/9))
 
 ## [0.0.10] - 2023.01.26
 
 ### Changed
 
 - Removed extra message from CLI commands.
-  ([#8](https://github.com/ryanking13/auditwheel-emscripten/pull/8))
+  ([#8](https://github.com/pyodide/auditwheel-emscripten/pull/8))
 - Changed the output format of `exports` and `imports` CLI command in order to
   make it easier to parse with `grep`.
-  ([#8](https://github.com/ryanking13/auditwheel-emscripten/pull/8))
+  ([#8](https://github.com/pyodide/auditwheel-emscripten/pull/8))
 
 ## [0.0.9] - 2022.12.20
 
 ### Fixed
 
 - `pyodide auditwheel show` now will work on modules with .wasm suffix
-([#7](https://github.com/ryanking13/auditwheel-emscripten/pull/7))
+([#7](https://github.com/pyodide/auditwheel-emscripten/pull/7))
 
 ### Changed
 
  - Changed the CLI entry point name from `pyodide audit` to `pyodide auditwheel`
- ([#5](https://github.com/ryanking13/auditwheel-emscripten/pull/5))
+ ([#5](https://github.com/pyodide/auditwheel-emscripten/pull/5))

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: auditwheel_emscripten
-Version: 0.1.0
+Version: 0.2.0
 Summary: auditwheel-like tool for Pyodide
-Project-URL: Home, https://github.com/ryanking13/auditwheel-emscripten
+Project-URL: Home, https://github.com/pyodide/auditwheel-emscripten
 Author-email: Gyeongjae Choi <def6488@gmail.com>
 License: Mozilla Public License Version 2.0
         ==================================
@@ -391,7 +391,7 @@ Description-Content-Type: text/markdown
 # auditwheel-emscripten
 
 [![PyPI Latest Release](https://img.shields.io/pypi/v/auditwheel-emscripten.svg)](https://pypi.org/project/auditwheel-emscripten/)
-![Test Status](https://github.com/ryanking13/auditwheel-emscripten/actions/workflows/test.yml/badge.svg)
+![Test Status](https://github.com/pyodide/auditwheel-emscripten/actions/workflows/test.yml/badge.svg)
 
 auditwheel-like tool for wheels targeting Emscripten platform
 
@@ -429,26 +429,29 @@ Python-in-the-browser using Emscripten.
 ```
 
 ```sh
-# wget https://cdn.jsdelivr.net/pyodide/v0.21.3/full/Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-$ pyodide auditwheel show Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-
-The following external shared libraries are required:
-{
-│   'shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so': ['libgeos_c.so'],
-│   'shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so': ['libgeos_c.so']
-}
+$ pyodide auditwheel show shapely-2.0.7-cp313-cp313-pyodide_2025_0_wasm32.whl
+shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so:
+        libgeos_c.so
+
+shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so:
+        libgeos_c.so
 ```
 
 ```sh
-$ pyodide auditwheel repair --libdir <directory which contains libgeos_c.so> Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-
-Repaired wheel has following external shared libraries:
-{
-│   'Shapely.libs/libgeos.so.3.10.3': [],
-│   'Shapely.libs/libgeos_c.so': ['libgeos.so.3.10.3'],
-│   'shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so': ['libgeos_c.so'],
-│   'shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so': ['libgeos_c.so']
-}
+$ pyodide auditwheel repair --libdir <directory which contains libgeos_c.so> shapely-2.0.7-cp313-cp313-pyodide_2025_0_wasm32.whl
+shapely/lib.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely/_geometry_helpers.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely/_geos.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely.libs/libgeos.so:
+
+shapely.libs/libgeos_c.so:
+        libgeos.so => shapely.libs/libgeos.so
 ```
 
 

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/README.md

@@ -1,7 +1,7 @@
 # auditwheel-emscripten
 
 [![PyPI Latest Release](https://img.shields.io/pypi/v/auditwheel-emscripten.svg)](https://pypi.org/project/auditwheel-emscripten/)
-![Test Status](https://github.com/ryanking13/auditwheel-emscripten/actions/workflows/test.yml/badge.svg)
+![Test Status](https://github.com/pyodide/auditwheel-emscripten/actions/workflows/test.yml/badge.svg)
 
 auditwheel-like tool for wheels targeting Emscripten platform
 
@@ -39,26 +39,29 @@ Python-in-the-browser using Emscripten.
 ```
 
 ```sh
-# wget https://cdn.jsdelivr.net/pyodide/v0.21.3/full/Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-$ pyodide auditwheel show Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-
-The following external shared libraries are required:
-{
-│   'shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so': ['libgeos_c.so'],
-│   'shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so': ['libgeos_c.so']
-}
+$ pyodide auditwheel show shapely-2.0.7-cp313-cp313-pyodide_2025_0_wasm32.whl
+shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so:
+        libgeos_c.so
+
+shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so:
+        libgeos_c.so
 ```
 
 ```sh
-$ pyodide auditwheel repair --libdir <directory which contains libgeos_c.so> Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
-
-Repaired wheel has following external shared libraries:
-{
-│   'Shapely.libs/libgeos.so.3.10.3': [],
-│   'Shapely.libs/libgeos_c.so': ['libgeos.so.3.10.3'],
-│   'shapely/speedups/_speedups.cpython-310-wasm32-emscripten.so': ['libgeos_c.so'],
-│   'shapely/vectorized/_vectorized.cpython-310-wasm32-emscripten.so': ['libgeos_c.so']
-}
+$ pyodide auditwheel repair --libdir <directory which contains libgeos_c.so> shapely-2.0.7-cp313-cp313-pyodide_2025_0_wasm32.whl
+shapely/lib.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely/_geometry_helpers.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely/_geos.cpython-313-wasm32-emscripten.so:
+        libgeos_c.so => shapely.libs/libgeos_c.so
+
+shapely.libs/libgeos.so:
+
+shapely.libs/libgeos_c.so:
+        libgeos.so => shapely.libs/libgeos.so
 ```
 
 

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/auditwheel_emscripten/cli/main.py

@@ -1,9 +1,9 @@
 from pathlib import Path
 
 import typer
-from rich.pretty import pprint
 
 from .. import function_type, get_exports, get_imports, repair, show
+from ..show import locate_dependency
 from ..wheel_utils import unpack_if_wheel
 
 app = typer.Typer()
@@ -14,18 +14,55 @@ def main():
     """Auditwheel-like tool for emscripten wheels and shared libraries."""
 
 
+def print_dylib(
+    library: str,
+    deps: list[str],
+    runtime_paths: list[str],
+    libraries: list[str],
+    show_runtime_paths: bool = False,
+):
+    """
+    Print shared library dependencies and runtime paths.
+    The output looks similar to the output of `ldd`
+    """
+    print(f"{library}:")
+
+    for dep in deps:
+        line = f"\t{dep:>10}"
+        deppath = locate_dependency(library, dep, libraries, runtime_paths)
+        if deppath:
+            line += f" => {deppath}"
+        print(line)
+
+    if show_runtime_paths and runtime_paths:
+        print("\n\tRuntime search paths:")
+        for path in runtime_paths:
+            print(f"\t  {path}")
+
+    print()
+
+
 @app.command("show")
 def _show(
     wheel_or_so_file: Path = typer.Argument(
         ..., help="Path to wheel or a shared library file."
-    )
+    ),
+    show_runtime_paths: bool = typer.Option(
+        False,
+        "-r",
+        "--with-runtime-paths",
+        help="Show runtime paths.",
+    ),
 ):
     """
     Show shared library dependencies of a wheel or a shared library file.
     """
     try:
-        dependencies = show(wheel_or_so_file)
-        pprint(dependencies)
+        libraries = show(wheel_or_so_file)
+        for lib, (deps, runtime_paths) in libraries.items():
+            print_dylib(
+                lib, deps, runtime_paths, list(libraries.keys()), show_runtime_paths
+            )
     except Exception as e:
         raise e
 
@@ -41,6 +78,12 @@ def _repair(
         None,
         help="Directory to output repaired wheel or shared library. (default: overwrite the input file)",
     ),
+    show_runtime_paths: bool = typer.Option(
+        False,
+        "-r",
+        "--with-runtime-paths",
+        help="Show runtime paths.",
+    ),
 ):
     """
     Repair a wheel file: copy shared libraries to the wheel directory.
@@ -52,8 +95,11 @@ def _repair(
             output_dir,
             modify_rpath=True,
         )
-        dependencies = show(repaired_wheel)
-        pprint(dependencies)
+        libraries = show(repaired_wheel)
+        for lib, (deps, runtime_paths) in libraries.items():
+            print_dylib(
+                lib, deps, runtime_paths, list(libraries.keys()), show_runtime_paths
+            )
     except RuntimeError as e:
         raise e
 

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/auditwheel_emscripten/repair.py

@@ -21,7 +21,7 @@ def resolve_sharedlib(wheel_file: str | Path, libdir: str | Path) -> dict[str, P
 
     dependencies_resolved: dict[str, Path] = {}
     while dep_queue:
-        lib, deps = dep_queue.popleft()
+        lib, (deps, _) = dep_queue.popleft()
         for dep in deps:
             if dep in dependencies_resolved:
                 continue

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/auditwheel_emscripten/show.py

@@ -1,5 +1,6 @@
 import tempfile
 from pathlib import Path
+import os.path
 
 from .lib_utils import get_all_shared_libs_in_dir, sharedlib_regex
 from .module import parse_dylink_section
@@ -7,26 +8,31 @@ from .wheel_utils import is_emscripten_wheel, unpack
 from .wasm_utils import is_wasm_module
 
 
-def show_dylib(dylib_file: Path) -> list[str]:
+def show_dylib(dylib_file: Path) -> tuple[list[str], list[str]]:
     if not is_wasm_module(dylib_file):
         raise RuntimeError(f"{dylib_file} is not a WASM file")
 
     dylink = parse_dylink_section(dylib_file)
-    return dylink.needed
+    return dylink.needed, dylink.runtime_paths
 
 
-def show_wheel_unpacked(wheel_extract_dir: str | Path) -> dict[str, list[str]]:
+def show_wheel_unpacked(
+    wheel_extract_dir: str | Path,
+) -> dict[str, tuple[list[str], list[str]]]:
     dependencies = {}
 
     shared_libs = get_all_shared_libs_in_dir(wheel_extract_dir)
     for shared_lib in shared_libs:
-        deps = show_dylib(shared_lib)
-        dependencies[shared_lib.relative_to(wheel_extract_dir).as_posix()] = deps
+        deps, runtime_paths = show_dylib(shared_lib)
+        dependencies[shared_lib.relative_to(wheel_extract_dir).as_posix()] = (
+            deps,
+            runtime_paths,
+        )
 
     return dependencies
 
 
-def show_wheel(wheel_file: Path) -> dict[str, list[str]]:
+def show_wheel(wheel_file: Path) -> dict[str, tuple[list[str], list[str]]]:
     if not is_emscripten_wheel(wheel_file.name):
         raise RuntimeError(f"{wheel_file} is not an emscripten wheel")
 
@@ -37,7 +43,7 @@ def show_wheel(wheel_file: Path) -> dict[str, list[str]]:
         return show_wheel_unpacked(extract_dir)
 
 
-def show(wheel_or_so_file: str | Path) -> dict[str, list[str]]:
+def show(wheel_or_so_file: str | Path) -> dict[str, tuple[list[str], list[str]]]:
     file = Path(wheel_or_so_file)
     if not file.exists():
         raise RuntimeError(f"no such file: {file}")
@@ -53,3 +59,21 @@ def show(wheel_or_so_file: str | Path) -> dict[str, list[str]]:
         }
     else:
         raise RuntimeError(f"unknown file type: {file}")
+
+
+def locate_dependency(
+    base: str, dep: str, libraries: list[str], runtime_paths: list[str]
+) -> str | None:
+    """
+    Check if the dependencies exists in the wheel using runtime paths.
+    If the dependency exists, return the path to the dependency.
+    Otherwise, return None.
+    """
+    for path in runtime_paths:
+        relpath = path.replace("$ORIGIN", "..")
+        # Always use unix-style separators
+        candidate = os.path.normpath(str(Path(base) / relpath / dep)).replace("\\", "/")
+        if candidate in libraries:
+            return candidate
+
+    return None

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/pyproject.toml

@@ -25,7 +25,7 @@ test = [
 
 
 [project.urls]
-Home = "https://github.com/ryanking13/auditwheel-emscripten"
+Home = "https://github.com/pyodide/auditwheel-emscripten"
 
 [project.entry-points."pyodide.cli"]
 auditwheel = "auditwheel_emscripten.cli.main:app"

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/test/test_repair.py

@@ -71,7 +71,7 @@ def test_repair(tmp_path, wheel_file, expected):
     repaired_wheel = repair(wheel_file, TEST_DATA, tmp_path, modify_rpath=True)
 
     libs = show(repaired_wheel)
-    libs_dependencies = list(chain(*libs.values()))
+    libs_dependencies = list(chain(*[dep for (dep, _) in libs.values()]))
     for expected_lib in expected:
         assert (
             expected_lib in libs_dependencies

{auditwheel_emscripten-0.1.0 → auditwheel_emscripten-0.2.0}/test/test_show.py

@@ -3,7 +3,7 @@ from itertools import chain
 import pytest
 from paths import GALPY_WHEEL, NUMPY_WHEEL, SHAPELY_WHEEL
 
-from auditwheel_emscripten.show import show
+from auditwheel_emscripten.show import show, locate_dependency
 
 
 @pytest.mark.parametrize(
@@ -59,8 +59,46 @@ def test_show(wheel_file, expected):
 def test_show_dependencies(wheel_file, expected):
     libs = show(wheel_file)
 
-    libs_dependencies = list(chain(*libs.values()))
+    libs_dependencies = list(chain(*[dep for (dep, _) in libs.values()]))
     for expected_lib in expected:
         assert (
             expected_lib in libs_dependencies
         ), f"expected lib {expected_lib} not found in dependencies"
+
+
+def test_locate_dependency():
+    # Test case 1: Dependency found in runtime path
+    base = "dir/lib.so"
+    dep = "libdep.so"
+    libraries = ["dir/subdir/libdep.so", "other/lib.so"]
+    runtime_paths = ["$ORIGIN/subdir"]
+
+    result = locate_dependency(base, dep, libraries, runtime_paths)
+    assert result == "dir/subdir/libdep.so"
+
+    # Test case 2: Dependency not found
+    base = "dir/lib.so"
+    dep = "libmissing.so"
+    libraries = ["dir/subdir/libdep.so", "other/lib.so"]
+    runtime_paths = ["$ORIGIN/subdir"]
+
+    result = locate_dependency(base, dep, libraries, runtime_paths)
+    assert result is None
+
+    # Test case 3: Multiple runtime paths, dependency in second path
+    base = "dir/lib.so"
+    dep = "libdep.so"
+    libraries = ["dir/path2/libdep.so", "other/lib.so"]
+    runtime_paths = ["$ORIGIN/path1", "$ORIGIN/path2"]
+
+    result = locate_dependency(base, dep, libraries, runtime_paths)
+    assert result == "dir/path2/libdep.so"
+
+    # Test case 4: rpath contains ".."
+    base = "dir/subdir/lib.so"
+    dep = "libdep.so"
+    libraries = ["dir/libdep.so", "other/lib.so"]
+    runtime_paths = ["$ORIGIN/.."]
+
+    result = locate_dependency(base, dep, libraries, runtime_paths)
+    assert result == "dir/libdep.so"