hatch-cpp 0.4.2__tar.gz → 0.5.1__tar.gz

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/.gitignore

@@ -13,6 +13,10 @@ __pycache__/
 *.exp
 *.lib
 
+# vcpkg
+vcpkg/
+vcpkg_installed/
+
 # Rust
 target
 target-capi
@@ -142,6 +146,7 @@ hatch_cpp/labextension
 
 # Emscripten SDK (locally installed)
 emsdk
+.pyodide_build/
 
 # Mac
 .DS_Store

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hatch-cpp
-Version: 0.4.2
+Version: 0.5.1
 Summary: Hatch plugin for C++ builds
 Project-URL: Repository, https://github.com/python-project-templates/hatch-cpp
 Project-URL: Homepage, https://github.com/python-project-templates/hatch-cpp
@@ -227,5 +227,21 @@ options:
 
 `hatch-cpp` will respect standard environment variables for compiler control, e.g. `CC`, `CXX`, `LD`, `CMAKE_GENERATOR`, `OSX_DEPLOYMENT_TARGET`, etc.
 
+### Pyodide
+
+Pyodide builds are detected from `PYODIDE_ABI_VERSION`. The hook preserves Pyodide's Emscripten compiler wrappers, gives extension modules CPython's Emscripten suffix, and emits the corresponding `pyemscripten` wheel platform tag. No project-specific build hook is required.
+
+```toml
+[tool.hatch.build.hooks.hatch-cpp]
+libraries = [
+    {name = "project/extension", sources = ["cpp/extension.cpp"], binding = "pybind11"},
+]
+
+[tool.cibuildwheel.pyodide]
+test-command = "python -c 'from project.extension import answer; assert answer() == 42'"
+```
+
+When a `vcpkg.json` manifest is active, Emscripten builds use vcpkg's `wasm32-emscripten` community triplet. Package support varies by port.
+
 > [!NOTE]
 > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/README.md

@@ -181,5 +181,21 @@ options:
 
 `hatch-cpp` will respect standard environment variables for compiler control, e.g. `CC`, `CXX`, `LD`, `CMAKE_GENERATOR`, `OSX_DEPLOYMENT_TARGET`, etc.
 
+### Pyodide
+
+Pyodide builds are detected from `PYODIDE_ABI_VERSION`. The hook preserves Pyodide's Emscripten compiler wrappers, gives extension modules CPython's Emscripten suffix, and emits the corresponding `pyemscripten` wheel platform tag. No project-specific build hook is required.
+
+```toml
+[tool.hatch.build.hooks.hatch-cpp]
+libraries = [
+    {name = "project/extension", sources = ["cpp/extension.cpp"], binding = "pybind11"},
+]
+
+[tool.cibuildwheel.pyodide]
+test-command = "python -c 'from project.extension import answer; assert answer() == 42'"
+```
+
+When a `vcpkg.json` manifest is active, Emscripten builds use vcpkg's `wasm32-emscripten` community triplet. Package support varies by port.
+
 > [!NOTE]
 > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.2"
+__version__ = "0.5.1"
 
 from .config import *
 from .hooks import *

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/config.py

@@ -93,12 +93,19 @@ class HatchCppBuildPlan(HatchCppBuildConfig):
             if "vcpkg" in self._active_toolchains:
                 log.warning("vcpkg toolchain is active; ensure that your compiler is configured to use vcpkg includes and libs.")
 
-            for library in self.libraries:
+            for library_index, library in enumerate(self.libraries):
                 compile_flags = self.platform.get_compile_flags(library, self.build_type)
                 link_flags = self.platform.get_link_flags(library, self.build_type)
-                self.commands.append(
-                    f"{self.platform.cc if library.language == 'c' else self.platform.cxx} {' '.join(library.sources)} {compile_flags} {link_flags}"
-                )
+                compiler = self.platform.cc if library.language == "c" else self.platform.cxx
+                if self.platform.platform == "emscripten":
+                    objects = []
+                    for source_index, source in enumerate(library.sources):
+                        obj = Path("build/hatch-cpp") / f"{library_index}-{source_index}-{Path(source).stem}.o"
+                        objects.append(str(obj))
+                        self.commands.append(f"{compiler} -c {source} {compile_flags} -o {obj}")
+                    self.commands.append(f"{compiler} {' '.join(objects)} {link_flags}")
+                else:
+                    self.commands.append(f"{compiler} {' '.join(library.sources)} {compile_flags} {link_flags}")
 
         if "cmake" in self._active_toolchains:
             self.commands.extend(self.cmake.generate(self))
@@ -106,6 +113,8 @@ class HatchCppBuildPlan(HatchCppBuildConfig):
         return self.commands
 
     def execute(self):
+        if self.platform.platform == "emscripten" and "vanilla" in self._active_toolchains:
+            Path("build/hatch-cpp").mkdir(parents=True, exist_ok=True)
         for command in self.commands:
             ret = system_call(command)
             if ret != 0:

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/plugin.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from os import environ
 from pathlib import Path
 from platform import machine as platform_machine
-from sys import platform as sys_platform, version_info
+from sys import version_info
 from typing import Any
 
 from hatch_build import parse_extra_args_model
@@ -14,6 +15,25 @@ from .utils import import_string
 __all__ = ("HatchCppBuildHook",)
 
 
+def _wheel_tag(platform: str, machine: str, version_major: int, version_minor: int, abi3: bool) -> str:
+    if platform == "emscripten":
+        abi_version = environ.get("PYODIDE_ABI_VERSION")
+        if not abi_version:
+            raise ValueError("PYODIDE_ABI_VERSION is required for Emscripten wheel tags.")
+        return f"cp{version_major}{version_minor}-cp{version_major}{version_minor}-pyemscripten_{abi_version}_wasm32"
+
+    if platform == "darwin":
+        os_name = "macosx_11_0"
+    elif platform == "linux":
+        os_name = "linux"
+    else:
+        os_name = "win"
+    # platform.machine() reports AMD64/ARM64 on Windows, but PEP 425 platform tags are lowercase
+    machine = machine.lower()
+    abi = "abi3" if abi3 else f"cp{version_major}{version_minor}"
+    return f"cp{version_major}{version_minor}-{abi}-{os_name}_{machine}"
+
+
 class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
     """The hatch-cpp build hook."""
 
@@ -76,29 +96,19 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
             machine = platform_machine()
             version_major = version_info.major
             version_minor = version_info.minor
-            if "darwin" in sys_platform:
-                os_name = "macosx_11_0"
-            elif "linux" in sys_platform:
-                os_name = "linux"
-            else:
-                os_name = "win"
-            if all(lib.py_limited_api for lib in build_plan.libraries):
-                build_data["tag"] = f"cp{version_major}{version_minor}-abi3-{os_name}_{machine}"
-            else:
-                build_data["tag"] = f"cp{version_major}{version_minor}-cp{version_major}{version_minor}-{os_name}_{machine}"
+            build_data["tag"] = _wheel_tag(
+                build_plan.platform.platform,
+                machine,
+                version_major,
+                version_minor,
+                all(lib.py_limited_api for lib in build_plan.libraries),
+            )
         else:
             build_data["pure_python"] = False
             machine = platform_machine()
             version_major = version_info.major
             version_minor = version_info.minor
-            # TODO abi3
-            if "darwin" in sys_platform:
-                os_name = "macosx_11_0"
-            elif "linux" in sys_platform:
-                os_name = "linux"
-            else:
-                os_name = "win"
-            build_data["tag"] = f"cp{version_major}{version_minor}-cp{version_major}{version_minor}-{os_name}_{machine}"
+            build_data["tag"] = _wheel_tag(build_plan.platform.platform, machine, version_major, version_minor, False)
 
             # force include libraries
             for path in Path(".").rglob("*"):

hatch_cpp-0.5.1/hatch_cpp/tests/test_project_pyodide/cpp/extension.cpp

@@ -0,0 +1,9 @@
+#include <pybind11/pybind11.h>
+
+int answer() {
+    return 42;
+}
+
+PYBIND11_MODULE(extension, module) {
+    module.def("answer", &answer);
+}

hatch_cpp-0.5.1/hatch_cpp/tests/test_project_pyodide/pyodide_project/__init__.py

@@ -0,0 +1,3 @@
+from .extension import answer
+
+__all__ = ("answer",)

hatch_cpp-0.5.1/hatch_cpp/tests/test_project_pyodide/pyproject.toml

@@ -0,0 +1,20 @@
+[build-system]
+requires = ["hatchling>=1.20"]
+build-backend = "hatchling.build"
+
+[project]
+name = "hatch-cpp-test-project-pyodide"
+version = "0.1.0"
+requires-python = ">=3.14"
+
+[tool.hatch.build.targets.wheel]
+packages = ["pyodide_project"]
+
+[tool.hatch.build.hooks.hatch-cpp]
+verbose = true
+libraries = [
+    {name = "pyodide_project/extension", sources = ["cpp/extension.cpp"], binding = "pybind11"},
+]
+
+[tool.cibuildwheel.pyodide]
+test-command = "python -c 'from pyodide_project import answer; assert answer() == 42'"

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/tests/test_structs.py

@@ -8,6 +8,7 @@ from pydantic import ValidationError
 from toml import loads
 
 from hatch_cpp import HatchCppBuildConfig, HatchCppBuildPlan, HatchCppLibrary, HatchCppPlatform
+from hatch_cpp.plugin import _wheel_tag
 from hatch_cpp.toolchains.common import _normalize_rpath
 
 
@@ -58,6 +59,59 @@ class TestStructs:
         assert "clang++" in hatch_build_config.platform.cxx
         assert hatch_build_config.platform.toolchain == "gcc"
 
+    def test_pyodide_platform(self, monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.setenv("PYODIDE_ABI_VERSION", "2026_0")
+        monkeypatch.setenv("CC", "/toolchain/cc")
+        monkeypatch.setenv("CXX", "/toolchain/c++")
+
+        platform = HatchCppPlatform.default()
+        library = HatchCppLibrary(name="project/extension", sources=["extension.cpp"], binding="pybind11")
+
+        assert platform.platform == "emscripten"
+        assert platform.toolchain == "clang"
+        assert platform.cc == "/toolchain/cc"
+        assert platform.cxx == "/toolchain/c++"
+        assert library.get_qualified_name(platform.platform) == (
+            f"project/extension.cpython-{version_info.major}{version_info.minor}-wasm32-emscripten.so"
+        )
+        assert "-undefined dynamic_lookup" not in platform.get_link_flags(library)
+
+    def test_pyodide_wheel_tag(self, monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.setenv("PYODIDE_ABI_VERSION", "2026_0")
+
+        assert _wheel_tag("emscripten", "wasm32", 3, 14, False) == "cp314-cp314-pyemscripten_2026_0_wasm32"
+
+    def test_pyodide_wheel_tag_requires_abi_version(self, monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.delenv("PYODIDE_ABI_VERSION", raising=False)
+
+        with pytest.raises(ValueError, match="PYODIDE_ABI_VERSION"):
+            _wheel_tag("emscripten", "wasm32", 3, 14, False)
+
+    def test_wheel_tag_machine_is_lowercased(self):
+        assert _wheel_tag("win32", "AMD64", 3, 11, False) == "cp311-cp311-win_amd64"
+        assert _wheel_tag("win32", "ARM64", 3, 11, True) == "cp311-abi3-win_arm64"
+        assert _wheel_tag("linux", "x86_64", 3, 11, False) == "cp311-cp311-linux_x86_64"
+
+    def test_pyodide_build_plan_compiles_objects_before_linking(self, monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.setenv("PYODIDE_ABI_VERSION", "2026_0")
+        monkeypatch.setenv("CC", "/toolchain/cc")
+        monkeypatch.setenv("CXX", "/toolchain/c++")
+        build_plan = HatchCppBuildPlan(
+            name="pyodide-project",
+            libraries=[HatchCppLibrary(name="pyodide_project/extension", sources=["cpp/extension.cpp"], binding="pybind11")],
+            vcpkg=None,
+        )
+
+        build_plan.generate()
+
+        assert len(build_plan.commands) == 2
+        assert build_plan.commands[0].startswith("/toolchain/c++ -c cpp/extension.cpp ")
+        assert build_plan.commands[0].endswith(" -o build/hatch-cpp/0-0-extension.o")
+        assert build_plan.commands[1].startswith("/toolchain/c++ build/hatch-cpp/0-0-extension.o ")
+        assert build_plan.commands[1].endswith(
+            f" -shared -o pyodide_project/extension.cpython-{version_info.major}{version_info.minor}-wasm32-emscripten.so"
+        )
+
     def test_cmake_args_env_variable(self):
         """Test that CMAKE_ARGS environment variable is respected."""
         txt = (Path(__file__).parent / "test_project_cmake" / "pyproject.toml").read_text()

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/tests/test_vcpkg_ref.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
+from types import SimpleNamespace
 
 from hatch_cpp.toolchains.vcpkg import (
     HatchCppVcpkgConfiguration,
@@ -87,6 +88,10 @@ class TestVcpkgRefConfig:
         cfg = HatchCppVcpkgConfiguration(vcpkg_triplet="arm64-linux")
         assert cfg.vcpkg_triplet == "arm64-linux"
 
+    def test_emscripten_triplet(self):
+        cfg = HatchCppVcpkgConfiguration(vcpkg_triplet="wasm32-emscripten")
+        assert cfg.vcpkg_triplet == "wasm32-emscripten"
+
 
 class TestResolveVcpkgRef:
     """Tests for _resolve_vcpkg_ref priority logic."""
@@ -178,6 +183,16 @@ class TestVcpkgGenerate:
 
         assert "./vcpkg/vcpkg install --triplet arm64-linux" in commands
 
+    def test_generate_detects_emscripten_triplet(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+        build_plan = SimpleNamespace(platform=SimpleNamespace(platform="emscripten"))
+
+        cfg = HatchCppVcpkgConfiguration()
+        commands = cfg.generate(build_plan)
+
+        assert "./vcpkg/vcpkg install --triplet wasm32-emscripten" in commands
+
     def test_generate_uses_windows_command_paths(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
         monkeypatch.setattr("hatch_cpp.toolchains.vcpkg.sys_platform", "win32")

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/toolchains/common.py

@@ -4,7 +4,7 @@ from os import environ
 from pathlib import Path
 from re import match
 from shutil import which
-from sys import base_exec_prefix, exec_prefix, executable, platform as sys_platform
+from sys import base_exec_prefix, exec_prefix, executable, platform as sys_platform, version_info
 from sysconfig import get_config_var, get_path
 from typing import Any, Literal
 
@@ -29,11 +29,12 @@ CompilerToolchain = Literal["gcc", "clang", "msvc"]
 Toolchain = Literal["vcpkg", "cmake", "vanilla"]
 Language = Literal["c", "c++"]
 Binding = Literal["cpython", "pybind11", "nanobind", "generic"]
-Platform = Literal["linux", "darwin", "win32"]
+Platform = Literal["linux", "darwin", "win32", "emscripten"]
 PlatformDefaults = {
     "linux": {"CC": "gcc", "CXX": "g++", "LD": "ld"},
     "darwin": {"CC": "clang", "CXX": "clang++", "LD": "ld"},
     "win32": {"CC": "cl", "CXX": "cl", "LD": "link"},
+    "emscripten": {"CC": "emcc", "CXX": "em++", "LD": "wasm-ld"},
 }
 
 
@@ -100,6 +101,10 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
         return value
 
     def get_qualified_name(self, platform):
+        if platform == "emscripten":
+            if self.binding == "generic":
+                return f"{self.name}.wasm"
+            return f"{self.name}.cpython-{version_info.major}{version_info.minor}-wasm32-emscripten.so"
         if self.binding == "cpython" and not self.py_limited_api:
             suffix = get_config_var("EXT_SUFFIX")
             return f"{self.name}{suffix}"
@@ -242,9 +247,10 @@ class HatchCppPlatform(BaseModel):
 
     @staticmethod
     def default() -> HatchCppPlatform:
-        CC = environ.get("CC", PlatformDefaults[sys_platform]["CC"])
-        CXX = environ.get("CXX", PlatformDefaults[sys_platform]["CXX"])
-        LD = environ.get("LD", PlatformDefaults[sys_platform]["LD"])
+        platform = "emscripten" if environ.get("PYODIDE_ABI_VERSION") else sys_platform
+        CC = environ.get("CC", PlatformDefaults[platform]["CC"])
+        CXX = environ.get("CXX", PlatformDefaults[platform]["CXX"])
+        LD = environ.get("LD", PlatformDefaults[platform]["LD"])
         if "gcc" in CC and "g++" in CXX:
             toolchain = "gcc"
         elif "clang" in CC and "clang++" in CXX:
@@ -252,11 +258,11 @@ class HatchCppPlatform(BaseModel):
         elif "cl" in CC and "cl" in CXX:
             toolchain = "msvc"
         # Fallback to platform defaults
-        elif sys_platform == "linux":
+        elif platform == "linux":
             toolchain = "gcc"
-        elif sys_platform == "darwin":
+        elif platform in ("darwin", "emscripten"):
             toolchain = "clang"
-        elif sys_platform == "win32":
+        elif platform == "win32":
             toolchain = "msvc"
         else:
             toolchain = "gcc"
@@ -267,13 +273,13 @@ class HatchCppPlatform(BaseModel):
         #     LD = which("ld.mold")
         # elif which("ld.lld"):
         #     LD = which("ld.lld")
-        return HatchCppPlatform(cc=CC, cxx=CXX, ld=LD, platform=sys_platform, toolchain=toolchain)
+        return HatchCppPlatform(cc=CC, cxx=CXX, ld=LD, platform=platform, toolchain=toolchain)
 
     @model_validator(mode="wrap")
     @classmethod
     def validate_model(cls, data, handler):
         model = handler(data)
-        if which("ccache") and not model.disable_ccache and model.toolchain in ["gcc", "clang"]:
+        if which("ccache") and model.platform != "emscripten" and not model.disable_ccache and model.toolchain in ["gcc", "clang"]:
             if not model.cc.startswith("ccache "):
                 model.cc = f"ccache {model.cc}"
             if not model.cxx.startswith("ccache "):
@@ -324,7 +330,8 @@ class HatchCppPlatform(BaseModel):
         # Toolchain-specific flags
         if self.toolchain == "gcc":
             flags += " " + " ".join(f"-I{d}" for d in effective_include_dirs)
-            flags += " -fPIC"
+            if self.platform != "emscripten":
+                flags += " -fPIC"
             flags += " " + " ".join(effective_compile_args)
             flags += " " + " ".join(f"-D{macro}" for macro in effective_define_macros)
             flags += " " + " ".join(f"-U{macro}" for macro in effective_undef_macros)
@@ -332,7 +339,8 @@ class HatchCppPlatform(BaseModel):
                 flags += f" -std={library.std}"
         elif self.toolchain == "clang":
             flags += " ".join(f"-I{d}" for d in effective_include_dirs)
-            flags += " -fPIC"
+            if self.platform != "emscripten":
+                flags += " -fPIC"
             flags += " " + " ".join(effective_compile_args)
             flags += " " + " ".join(f"-D{macro}" for macro in effective_define_macros)
             flags += " " + " ".join(f"-U{macro}" for macro in effective_undef_macros)

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/hatch_cpp/toolchains/vcpkg.py

@@ -29,6 +29,7 @@ VcpkgTriplet = Literal[
     "arm64-uwp",
     "arm64-windows",
     "arm64-windows-static-md",
+    "wasm32-emscripten",
 ]
 VcpkgPlatformDefaults = {
     ("linux", "x86_64"): "x64-linux",
@@ -38,6 +39,7 @@ VcpkgPlatformDefaults = {
     ("win32", "x86_64"): "x64-windows-static-md",
     ("win32", "AMD64"): "x64-windows-static-md",
     ("win32", "arm64"): "arm64-windows-static-md",
+    ("emscripten", "wasm32"): "wasm32-emscripten",
 }
 
 
@@ -122,9 +124,11 @@ class HatchCppVcpkgConfiguration(BaseModel):
         commands = []
 
         if self.vcpkg_triplet is None:
-            self.vcpkg_triplet = VcpkgPlatformDefaults.get((sys_platform, platform_machine()))
+            platform = config.platform.platform if config is not None else sys_platform
+            machine = "wasm32" if platform == "emscripten" else platform_machine()
+            self.vcpkg_triplet = VcpkgPlatformDefaults.get((platform, machine))
             if self.vcpkg_triplet is None:
-                raise ValueError(f"Could not determine vcpkg triplet for platform {sys_platform} and architecture {platform_machine()}")
+                raise ValueError(f"Could not determine vcpkg triplet for platform {platform} and architecture {machine}")
 
         if self.vcpkg and Path(self.vcpkg).exists():
             vcpkg_root = Path(self.vcpkg_root)

{hatch_cpp-0.4.2 → hatch_cpp-0.5.1}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 description = "Hatch plugin for C++ builds"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.4.2"
+version = "0.5.1"
 requires-python = ">=3.10"
 keywords = [
     "hatch",
@@ -79,7 +79,7 @@ Repository = "https://github.com/python-project-templates/hatch-cpp"
 Homepage = "https://github.com/python-project-templates/hatch-cpp"
 
 [tool.bumpversion]
-current_version = "0.4.2"
+current_version = "0.5.1"
 commit = true
 tag = true
 commit_args = "-s"