auditwheel-emscripten 0.0.13__tar.gz → 0.0.15__tar.gz

auditwheel_emscripten-0.0.15/.github/workflows/deploy.yml

@@ -0,0 +1,50 @@
+name: deploy
+
+on:
+  push:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: main-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v3
+
+      - name: Install requirements and build wheel
+        shell: bash -l {0}
+        run: |
+          python -m pip install build
+          python -m build .
+      - name: Store the distribution packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-package-distributions
+          path: dist/
+  publish-to-pypi:
+    name: >-
+      Publish Python 🐍 distribution 📦 to PyPI
+    needs:
+    - build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/auditwheel-emscripten
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution 📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_language_version:
   python: "3.11"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v4.4.0"
+    rev: "v4.6.0"
     hooks:
       - id: check-case-conflict
       - id: check-merge-conflict
@@ -16,42 +16,42 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: "v3.4.0"
+    rev: "v3.16.0"
     hooks:
       - id: pyupgrade
         args: ["--py310-plus"]
 
   - repo: https://github.com/hadialqattan/pycln
-    rev: "v2.1.5"
+    rev: "v2.4.0"
     hooks:
       - id: pycln
         args: [--config=pyproject.toml]
         stages: [manual]
 
   - repo: https://github.com/psf/black
-    rev: "23.3.0"
+    rev: "24.4.2"
     hooks:
       - id: black
 
   - repo: https://github.com/pycqa/flake8
-    rev: "6.0.0"
+    rev: "7.0.0"
     hooks:
       - id: flake8
         additional_dependencies: [flake8-bugbear]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.3.0"
+    rev: "v1.10.0"
     hooks:
       - id: mypy
         exclude: auditwheel_emscripten/emscripten_tools
 
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: "v0.9.0.5"
+    rev: "v0.10.0.1"
     hooks:
       - id: shellcheck
 
   - repo: https://github.com/codespell-project/codespell
-    rev: "v2.2.4"
+    rev: "v2.3.0"
     hooks:
       - id: codespell
         args: ["-L", "te,slowy,aray,ba,nd,classs,crate,feld,lits"]

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [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))
+
+## [0.0.14] - 2023-12-23
+
+### Changed
+
+- 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))
+
+## [0.0.13] - 2023.06.08
+
+- Added py.typed file.
+  ([#16](https://github.com/ryanking13/auditwheel-emscripten/pull/16))
+
 ## [0.0.12] - 2023.02.13
 
 ### Fixed

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: auditwheel_emscripten
-Version: 0.0.13
+Version: 0.0.15
 Summary: auditwheel-like tool for Pyodide
 Project-URL: Home, https://github.com/ryanking13/auditwheel-emscripten
 Author-email: Gyeongjae Choi <def6488@gmail.com>
@@ -407,7 +407,7 @@ auditwheel-emscripten is a tiny tool to facilitate the creation of Python wheel
 Python-in-the-browser using Emscripten.
 
 - `pyodide auditwheel show`: shows external shared libraries that the wheel depends on.
-- `pyodide auditwheel copy`: copies these external shared libraries into the wheel itself.
+- `pyodide auditwheel repair`: copies these external shared libraries into the wheel itself.
 
 ## Usage (CLI)
 
@@ -420,10 +420,10 @@ Python-in-the-browser using Emscripten.
 │ --help          Show this message and exit.                                                                                         │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ╭─ Commands ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ copy      Copy shared libraries to the wheel directory. Similar to repair but does not modify the needed section of WASM module.    │
+│ copy      [Deprecated] Copy shared libraries to the wheel directory. Works same as repair. Use repair instead.          │
 │ exports   Show exports of a wheel or a shared library file.                                                                         │
 │ imports   Show imports of a wheel or a shared library file.                                                                         │
-│ repair    [Experimental] Repair a wheel file: copy shared libraries to the wheel directory and modify the path in the wheel file.   │
+│ repair    Repair a wheel file: copy shared libraries to the wheel directory.   │
 │ show      Show shared library dependencies of a wheel or a shared library file.                                                     │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -440,7 +440,7 @@ The following external shared libraries are required:
 ```
 
 ```sh
-$ pyodide auditwheel copy --libdir <directory which contains libgeos_c.so> Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
+$ 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:
 {
@@ -471,10 +471,6 @@ repaired_wheel = repair(
     "Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl",
     libdir="/path/where/shared/libraries/are/located",
     outdir="/path/to/output/directory",
-    # If set this to true, modify the needed section of WASM module.
-    # Note that is not compatible with WebAssembly dynamic linking ABI.
-    # https://github.com/WebAssembly/tool-conventions/blob/main/DynamicLinking.md
-    modify_needed_section=False,
 )
 libs = show(repaired_wheel)
 print(libs)

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/README.md

@@ -17,7 +17,7 @@ auditwheel-emscripten is a tiny tool to facilitate the creation of Python wheel
 Python-in-the-browser using Emscripten.
 
 - `pyodide auditwheel show`: shows external shared libraries that the wheel depends on.
-- `pyodide auditwheel copy`: copies these external shared libraries into the wheel itself.
+- `pyodide auditwheel repair`: copies these external shared libraries into the wheel itself.
 
 ## Usage (CLI)
 
@@ -30,10 +30,10 @@ Python-in-the-browser using Emscripten.
 │ --help          Show this message and exit.                                                                                         │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ╭─ Commands ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ copy      Copy shared libraries to the wheel directory. Similar to repair but does not modify the needed section of WASM module.    │
+│ copy      [Deprecated] Copy shared libraries to the wheel directory. Works same as repair. Use repair instead.          │
 │ exports   Show exports of a wheel or a shared library file.                                                                         │
 │ imports   Show imports of a wheel or a shared library file.                                                                         │
-│ repair    [Experimental] Repair a wheel file: copy shared libraries to the wheel directory and modify the path in the wheel file.   │
+│ repair    Repair a wheel file: copy shared libraries to the wheel directory.   │
 │ show      Show shared library dependencies of a wheel or a shared library file.                                                     │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -50,7 +50,7 @@ The following external shared libraries are required:
 ```
 
 ```sh
-$ pyodide auditwheel copy --libdir <directory which contains libgeos_c.so> Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl
+$ 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:
 {
@@ -81,10 +81,6 @@ repaired_wheel = repair(
     "Shapely-1.8.2-cp310-cp310-emscripten_3_1_14_wasm32.whl",
     libdir="/path/where/shared/libraries/are/located",
     outdir="/path/to/output/directory",
-    # If set this to true, modify the needed section of WASM module.
-    # Note that is not compatible with WebAssembly dynamic linking ABI.
-    # https://github.com/WebAssembly/tool-conventions/blob/main/DynamicLinking.md
-    modify_needed_section=False,
 )
 libs = show(repaired_wheel)
 print(libs)

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/auditwheel_emscripten/cli/main.py

@@ -43,11 +43,14 @@ def _repair(
     ),
 ):
     """
-    [Experimental] Repair a wheel file: copy shared libraries to the wheel directory and modify the path in the wheel file.
+    Repair a wheel file: copy shared libraries to the wheel directory.
     """
     try:
         repaired_wheel = repair(
-            wheel_file, libdir, output_dir, modify_needed_section=True
+            wheel_file,
+            libdir,
+            output_dir,
+            modify_needed_section=False,
         )
         dependencies = show(repaired_wheel)
         pprint(dependencies)
@@ -68,16 +71,9 @@ def _copy(
     ),
 ):
     """
-    Copy shared libraries to the wheel directory. Similar to repair but does not modify the needed section of WASM module.
+    [Deprecated] Copy shared libraries to the wheel directory. Works same as `repair`. Use `repair` instead.
     """
-    try:
-        repaired_wheel = repair(
-            wheel_file, libdir, output_dir, modify_needed_section=False
-        )
-        dependencies = show(repaired_wheel)
-        pprint(dependencies)
-    except RuntimeError as e:
-        raise e
+    return _repair(wheel_file, libdir, output_dir)
 
 
 @app.command("exports")

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/auditwheel_emscripten/repair.py

@@ -80,7 +80,7 @@ def repair(
     libdir: str | Path,
     outdir: str | Path | None,
     lib_sdir: str = ".libs",
-    modify_needed_section: bool = False,
+    modify_needed_section: bool = False,  # Deprecated
 ) -> Path:
     file = Path(wheel_file)
     if not file.exists():
@@ -100,10 +100,7 @@ def repair(
         tmpdir = Path(tmpdirname)
 
         extract_dir = unpack(str(wheel_file), str(tmpdir))
-        if modify_needed_section:
-            repair_extracted(extract_dir, dep_map, lib_sdir)
-        else:
-            copylib(extract_dir, dep_map, lib_sdir)
+        copylib(extract_dir, dep_map, lib_sdir)
         pack(str(extract_dir), str(outdir), None)
 
     return outdir / file.name

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/auditwheel_emscripten/wheel_utils.py

@@ -36,7 +36,7 @@ def is_emscripten_wheel(filename: str) -> bool:
     _, _, _, tags = parse_wheel_filename(filename)
     tag = list(tags)[0]
     platform = tag.platform
-    return platform.startswith("emscripten")
+    return platform.startswith(("emscripten", "pyodide"))
 
 
 def parse_wheel_extract_dir(wheel_file: str | Path) -> str:

{auditwheel_emscripten-0.0.13 → auditwheel_emscripten-0.0.15}/test/test_repair.py

@@ -60,7 +60,7 @@ def test_copylib(tmp_path, wheel_file, expected):
             SHAPELY_WHEEL,
             [
                 "libgeos.so.3.10.3",
-                "../../Shapely.libs/libgeos_c.so",
+                "libgeos_c.so",
             ],
         ),
     ],

auditwheel_emscripten-0.0.15/test/test_wheel_utils.py

@@ -0,0 +1,16 @@
+import pytest
+
+from auditwheel_emscripten.wheel_utils import is_emscripten_wheel
+
+
+@pytest.mark.parametrize(
+    "wheel_name, expected",
+    [
+        ("foo-1.0-cp38-cp38-linux_x86_64.whl", False),
+        ("foo-1.0-py3-none-any.whl", False),
+        ("foo-1.0-cp312-cp312-pyodide_2024_0_wasm32.whl", True),
+        ("foo-1.0-cp312-cp312-emscripten_3_1_52_wasm32.whl", True),
+    ],
+)
+def test_is_emscripten_wheel(wheel_name, expected):
+    assert is_emscripten_wheel(wheel_name) == expected

auditwheel_emscripten-0.0.13/.github/workflows/deploy.yml

@@ -1,32 +0,0 @@
-name: deploy
-
-on:
-  push:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: main-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    environment: PyPi-deploy
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-python@v3
-
-      - name: Install requirements and build wheel
-        shell: bash -l {0}
-        run: |
-          python -m pip install build twine
-          python -m build .
-      - name: Publish package
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}