Set wheel tag of cpython_module to cp312-cp312-pyodide_2025_0_wasm32 (#133)

We were tagging them py3-none-any which is not correct.

Author: hoodmane

pyodide_build/common.py

@@ -362,7 +362,18 @@ def modify_wheel(wheel: Path) -> Iterator[Path]:
         pack_wheel(wheel_dir, wheel.parent)
 
 
-def retag_wheel(wheel_path: Path, platform: str) -> Path:
+def retag_wheel(
+    wheel_path: Path,
+    platform: str,
+    *,
+    python: str | None = None,
+    abi: str | None = None,
+) -> Path:
+    extra_flags = []
+    if python:
+        extra_flags += ["--python-tag", python]
+    if abi:
+        extra_flags += ["--abi-tag", abi]
     result = subprocess.run(
         [
             sys.executable,
@@ -373,6 +384,7 @@ def retag_wheel(wheel_path: Path, platform: str) -> Path:
             "--platform-tag",
             platform,
             "--remove",
+            *extra_flags,
         ],
         check=False,
         encoding="utf-8",

pyodide_build/recipe/builder.py

@@ -24,6 +24,8 @@
     get_build_environment_vars,
     get_build_flag,
     get_pyodide_root,
+    get_pyversion_major,
+    get_pyversion_minor,
     pyodide_tags,
     replace_so_abi_tags,
     wheel_platform,
@@ -555,7 +557,10 @@ def _package_wheel(
                 + "\n".join(f.name for f in self.src_dist_dir.glob("*.whl"))
             )
 
-        if "emscripten" in wheel.name:
+        if self.package_type == "cpython_module":
+            abi = f"cp{get_pyversion_major()}{get_pyversion_minor()}"
+            wheel = retag_wheel(wheel, wheel_platform(), python=abi, abi=abi)
+        elif "emscripten" in wheel.name:
             # Retag platformed wheels to pyodide
             wheel = retag_wheel(wheel, wheel_platform())
 

pyodide_build/tests/recipe/_test_recipes/pydecimal/meta.yaml

@@ -0,0 +1,13 @@
+package:
+  name: pydecimal
+  version: 1.0.0 # Nonsense
+  tag:
+    - always
+  top-level:
+    - _pydecimal
+source:
+  path: src
+build:
+  type: cpython_module
+about:
+  license: PSF

pyodide_build/tests/recipe/_test_recipes/pydecimal/src/_pydecimal.py

@@ -0,0 +1 @@
+print("hi!")

pyodide_build/tests/recipe/_test_recipes/pydecimal/src/pyproject.toml

@@ -0,0 +1,23 @@
+[project]
+name = "pydecimal"
+authors = [
+  { name= "Pyodide" },
+]
+description = "Unvendored pydecimal for Pyodide"
+version = "1.0.0"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.sdist]
+ignore-vcs = true
+
+[tool.hatch.build.targets.wheel]
+ignore-vcs = true
+include = [
+  "_pydecimal.py",
+]
+exclude = [
+  "Python-*",
+]

pyodide_build/tests/test_cli.py

@@ -83,7 +83,7 @@ def test_build_recipe_plain(tmp_path, dummy_xbuildenv, mock_emscripten):
         "pkg_test_graph3": {},
     }
 
-    pkgs_to_build = pkgs.keys() | {p for v in pkgs.values() for p in v}
+    pkgs_to_build = pkgs.keys() | {p for v in pkgs.values() for p in v} | {"pydecimal"}
 
     for build_dir in RECIPE_DIR.rglob("build"):
         shutil.rmtree(build_dir)
@@ -551,3 +551,32 @@ def run(srcdir, outdir, exports, config_settings):
         "--key3": "",
         "--key4": "--value4",
     }
+
+
+def test_build_cpython_module(tmp_path, dummy_xbuildenv, mock_emscripten):
+    for build_dir in RECIPE_DIR.rglob("build"):
+        shutil.rmtree(build_dir)
+
+    app = typer.Typer()
+    app.command()(build_recipes.build_recipes_no_deps)
+
+    pkg = "pydecimal"
+    for recipe in RECIPE_DIR.glob("**/meta.yaml"):
+        recipe.touch()
+    result = runner.invoke(
+        app,
+        [
+            pkg,
+            "--recipe-dir",
+            str(RECIPE_DIR),
+        ],
+    )
+    assert_runner_succeeded(result)
+
+    assert f"Succeeded building package {pkg}" in result.stdout
+
+    dist_dir = RECIPE_DIR / pkg / "dist"
+    results = list(dist_dir.glob("*.whl"))
+    assert len(results) == 1
+    result = results[0]
+    assert result.name == "pydecimal-1.0.0-cp312-cp312-pyodide_2024_0_wasm32.whl"