auditwheel-emscripten 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

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/repair.py

@@ -9,19 +9,22 @@ from .show import show
 from .wheel_utils import WHEEL_INFO_RE, is_emscripten_wheel, pack, unpack
 
 
-def resolve_sharedlib(wheel_file: str | Path, libdir: str | Path) -> dict[str, Path]:
+def resolve_sharedlib(wheel_file: str | Path, libdir: str | Path | list[str | Path]) -> dict[str, Path]:
     """
     Resolve the full path of shared libraries inside the wheel file
     """
+    libdirs = []
+    libdir = libdir if isinstance(libdir, list) else [libdir]
 
-    libdirs = libdir_candidates(libdir)
+    for d in libdir:
+        libdirs.extend(libdir_candidates(d))
 
     dependencies = show(wheel_file)
     dep_queue = deque([lib, deps] for lib, deps in dependencies.items())
 
     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/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.dist-info → auditwheel_emscripten-0.2.1.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: auditwheel_emscripten
-Version: 0.1.0
+Version: 0.2.1
 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.dist-info → auditwheel_emscripten-0.2.1.dist-info}/RECORD

@@ -5,18 +5,18 @@ auditwheel_emscripten/imports.py,sha256=YI8KItf1qujmycSLb7c7igpCBXNqJAJVUIH3H8HY
 auditwheel_emscripten/lib_utils.py,sha256=4qodvz1go0tgHZA803Q3vcIR-QQbOdqSR0p2wo7wjrA,682
 auditwheel_emscripten/module.py,sha256=wwLAzlhGKgGojNvUdommO7FGfME49rWVRZOPRp77qjU,6619
 auditwheel_emscripten/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditwheel_emscripten/repair.py,sha256=CvTj2SobzAfQjKbXPqvPe7lWRPD9DTHEfJFpHuQD7KY,3755
-auditwheel_emscripten/show.py,sha256=TTulud3juo1QPo7avIa0K_nOR7iYBAVIMpUdXKaLLVI,1714
+auditwheel_emscripten/repair.py,sha256=ucqS6igx5U-wGcTcpqeQa3Gi9sZ2EyykWSrhCNl4yoI,3884
+auditwheel_emscripten/show.py,sha256=i_2bOE-IP3fghGN4Sc5qAm4rIQ7NbvPucpv3G2klE4Y,2483
 auditwheel_emscripten/wasm_utils.py,sha256=-IuAWiPPOkWmPpaW4u3tyxttpP0ZTWeKk0VMh1dj384,220
 auditwheel_emscripten/wheel_utils.py,sha256=_uh8MiKYpjtBcpOE5bG2vEfh9eXlZhz-nMMVo6-Fvl8,2995
 auditwheel_emscripten/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditwheel_emscripten/cli/main.py,sha256=rhJoQCu8uL_CPevF3vIrZ6c3IsDILTgxW8JNfc5lADY,4043
+auditwheel_emscripten/cli/main.py,sha256=9_yxawwpf_5A8ED3mWtZZHezMklDrp-iWE4UCs_hvsA,5334
 auditwheel_emscripten/emscripten_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 auditwheel_emscripten/emscripten_tools/diagnostics.py,sha256=fG8kS7BByJKwC3JJrfJc0TB1EDV4W--LQwcf4fnN0GI,7072
 auditwheel_emscripten/emscripten_tools/utils.py,sha256=sAcW8WaxfN0lNA64y9d0_CsdfYecV_YUcN6nrDrMmMs,3316
 auditwheel_emscripten/emscripten_tools/webassembly.py,sha256=ppyx_lzgtve2hCDn8jQn1Wto_2pGv-Kk-CcOhqUB8NQ,17408
-auditwheel_emscripten-0.1.0.dist-info/METADATA,sha256=6ofoErOVppyKzcdUEdCT_7rftjfEVFSvTjfmY-62o-M,27093
-auditwheel_emscripten-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-auditwheel_emscripten-0.1.0.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
-auditwheel_emscripten-0.1.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-auditwheel_emscripten-0.1.0.dist-info/RECORD,,
+auditwheel_emscripten-0.2.1.dist-info/METADATA,sha256=KKKQoL_DrnVUEE2yP3StzHSv9BZi9mBLc-b2nDUzggk,26972
+auditwheel_emscripten-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+auditwheel_emscripten-0.2.1.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
+auditwheel_emscripten-0.2.1.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+auditwheel_emscripten-0.2.1.dist-info/RECORD,,

{auditwheel_emscripten-0.1.0.dist-info → auditwheel_emscripten-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any