auditwheel-emscripten 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

auditwheel_emscripten/cli/main.py

@@ -1,16 +1,14 @@
 from pathlib import Path
 
-import typer
+import click
 
 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()
 
-
-@app.callback(no_args_is_help=True)
-def main():
+@click.group(no_args_is_help=True)
+def app():
     """Auditwheel-like tool for emscripten wheels and shared libraries."""
 
 
@@ -43,19 +41,18 @@ def print_dylib(
 
 
 @app.command("show")
+@click.argument("wheel_or_so_file", type=click.Path(path_type=Path))
+@click.option("--with-runtime-paths", "-r", is_flag=True, help="Show runtime paths.")
 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.",
-    ),
+    wheel_or_so_file: Path,
+    show_runtime_paths: bool,
 ):
     """
     Show shared library dependencies of a wheel or a shared library file.
+
+    \b
+    Arguments:
+        WHEEL_OR_SO_FILE: Path to wheel or a shared library file. (required)
     """
     try:
         libraries = show(wheel_or_so_file)
@@ -68,25 +65,33 @@ def _show(
 
 
 @app.command("repair")
+@click.argument("wheel_file", type=click.Path(path_type=Path))
+@click.option(
+    "--libdir",
+    type=click.Path(path_type=Path),
+    default="lib",
+    help="Path to the directory containing the shared libraries.",
+    show_default=True,
+)
+@click.option(
+    "--output-dir",
+    type=click.Path(path_type=Path),
+    default=None,
+    help="Directory to output repaired wheel or shared library. (default: overwrite the input file)",
+)
+@click.option("--with-runtime-paths", "-r", is_flag=True, help="Show runtime paths.")
 def _repair(
-    wheel_file: Path = typer.Argument(..., help="Path to wheel file."),
-    libdir: Path = typer.Option(
-        "lib",
-        help="Path to the directory containing the shared libraries.",
-    ),
-    output_dir: Path = typer.Option(
-        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.",
-    ),
+    wheel_file: Path,
+    libdir: Path,
+    output_dir: Path | None,
+    show_runtime_paths: bool,
 ):
     """
     Repair a wheel file: copy shared libraries to the wheel directory.
+
+    \b
+    Arguments:
+        WHEEL_FILE: Path to wheel file. (required)
     """
     try:
         repaired_wheel = repair(
@@ -105,35 +110,54 @@ def _repair(
 
 
 @app.command("copy")
+@click.argument("wheel_file", type=click.Path(path_type=Path))
+@click.option(
+    "--libdir",
+    type=click.Path(path_type=Path),
+    default="lib",
+    help="Path to the directory containing the shared libraries.",
+    show_default=True,
+)
+@click.option(
+    "--output-dir",
+    type=click.Path(path_type=Path),
+    default=None,
+    help="Directory to output repaired wheel or shared library. (default: overwrite the input file)",
+)
 def _copy(
-    wheel_file: Path = typer.Argument(..., help="Path to wheel file."),
-    libdir: Path = typer.Option(
-        "lib",
-        help="Path to the directory containing the shared libraries.",
-    ),
-    output_dir: Path = typer.Option(
-        None,
-        help="Directory to output repaired wheel or shared library. (default: overwrite the input file)",
-    ),
+    wheel_file: Path,
+    libdir: Path,
+    output_dir: Path | None,
 ):
     """
     [Deprecated] Copy shared libraries to the wheel directory. Works same as `repair`. Use `repair` instead.
+
+    \b
+    Arguments:
+        WHEEL_FILE: Path to wheel file. (required)
     """
     return _repair(wheel_file, libdir, output_dir)
 
 
 @app.command("exports")
+@click.argument("wheel_or_so_file", type=click.Path(path_type=Path))
+@click.option(
+    "--show-type",
+    is_flag=True,
+    help="Show function type.",
+    default=False,
+    show_default=True,
+)
 def _exports(
-    wheel_or_so_file: Path = typer.Argument(
-        ..., help="Path to wheel or a shared library file."
-    ),
-    show_type: bool = typer.Option(
-        False,
-        help="Show function type.",
-    ),
+    wheel_or_so_file: Path,
+    show_type: bool,
 ):
     """
     Show exports of a wheel or a shared library file.
+
+    \b
+    Arguments:
+        WHEEL_OR_SO_FILE: Path to wheel or a shared library file. (required)
     """
     try:
         exports = get_exports(wheel_or_so_file)
@@ -154,17 +178,24 @@ def _exports(
 
 
 @app.command("imports")
+@click.argument("wheel_or_so_file", type=click.Path(path_type=Path))
+@click.option(
+    "--show-type",
+    is_flag=True,
+    help="Show function type.",
+    default=False,
+    show_default=True,
+)
 def _imports(
-    wheel_or_so_file: Path = typer.Argument(
-        ..., help="Path to wheel or a shared library file."
-    ),
-    show_type: bool = typer.Option(
-        False,
-        help="Show function type.",
-    ),
+    wheel_or_so_file: Path,
+    show_type: bool,
 ):
     """
     Show imports of a wheel or a shared library file.
+
+    \b
+    Arguments:
+        WHEEL_OR_SO_FILE: Path to wheel or a shared library file. (required)
     """
     try:
         imports = get_imports(wheel_or_so_file)

auditwheel_emscripten/repair.py

@@ -9,12 +9,15 @@ 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())

{auditwheel_emscripten-0.2.0.dist-info → auditwheel_emscripten-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auditwheel_emscripten
-Version: 0.2.0
+Version: 0.2.2
 Summary: auditwheel-like tool for Pyodide
 Project-URL: Home, https://github.com/pyodide/auditwheel-emscripten
 Author-email: Gyeongjae Choi <def6488@gmail.com>
@@ -381,8 +381,7 @@ License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: leb128
 Requires-Dist: packaging
-Requires-Dist: pyodide-cli
-Requires-Dist: typer
+Requires-Dist: pyodide-cli>=0.4
 Requires-Dist: wheel
 Provides-Extra: test
 Requires-Dist: pytest; extra == 'test'

{auditwheel_emscripten-0.2.0.dist-info → auditwheel_emscripten-0.2.2.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=jTbBG085JFlUmqUu2Tn_Zl3hPJ2LOcGaMXptbdOwxwo,3760
+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=9_yxawwpf_5A8ED3mWtZZHezMklDrp-iWE4UCs_hvsA,5334
+auditwheel_emscripten/cli/main.py,sha256=G-CjBFqf4Yxpg6CNcztGjHSDO2VvlMJFsG8uvMuia14,6044
 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.2.0.dist-info/METADATA,sha256=bLok9JVxWeMLJNo6vp5lDOSphtpefPxrU3Vtx3Jh-6M,26972
-auditwheel_emscripten-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-auditwheel_emscripten-0.2.0.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
-auditwheel_emscripten-0.2.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-auditwheel_emscripten-0.2.0.dist-info/RECORD,,
+auditwheel_emscripten-0.2.2.dist-info/METADATA,sha256=WOjWvK3WZvu2DSmCryCsag_HF2vvZ1Vzdp_PUJErUQI,26956
+auditwheel_emscripten-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+auditwheel_emscripten-0.2.2.dist-info/entry_points.txt,sha256=Jok5wALksOWKJv8BRV2Riozxts_stW2n-ud9uHTNCB8,62
+auditwheel_emscripten-0.2.2.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+auditwheel_emscripten-0.2.2.dist-info/RECORD,,

{auditwheel_emscripten-0.2.0.dist-info → auditwheel_emscripten-0.2.2.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