hatch-cpp 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl

hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.9"
+__version__ = "0.2.0"
 
 from .config import *
 from .hooks import *

hatch_cpp/plugin.py

@@ -7,6 +7,7 @@ from platform import machine as platform_machine
 from sys import platform as sys_platform, version_info
 from typing import Any
 
+from hatch_build import parse_extra_args_model
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
 
 from .config import HatchCppBuildConfig, HatchCppBuildPlan
@@ -52,6 +53,9 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
         # Instantiate builder
         build_plan = build_plan_class(**config.model_dump())
 
+        # Parse override args
+        parse_extra_args_model(build_plan)
+
         # Generate commands
         build_plan.generate()
 

hatch_cpp/tests/test_hatch_build.py

@@ -0,0 +1,46 @@
+from os import listdir
+from pathlib import Path
+from shutil import rmtree
+from subprocess import check_call
+from sys import modules, path, platform
+
+
+class TestHatchBuild:
+    def test_hatch_build(self):
+        project = "test_project_hatch_build"
+
+        rmtree(f"hatch_cpp/tests/{project}/project/extension.so", ignore_errors=True)
+        rmtree(f"hatch_cpp/tests/{project}/project/extension.pyd", ignore_errors=True)
+        modules.pop("project", None)
+        modules.pop("project.extension", None)
+
+        # compile
+        check_call(
+            [
+                "hatch-build",
+                "--hooks-only",
+                "--",
+                "--libraries.0.name=project/extension",
+                "--libraries.0.sources=cpp/project/basic.cpp",
+                "--libraries.0.include-dirs=cpp",
+                "--libraries.0.binding=nanobind",
+            ],
+            cwd=f"hatch_cpp/tests/{project}",
+        )
+
+        # assert built
+
+        if project == "test_project_limited_api" and platform != "win32":
+            assert "extension.abi3.so" in listdir(f"hatch_cpp/tests/{project}/project")
+        else:
+            if platform == "win32":
+                assert "extension.pyd" in listdir(f"hatch_cpp/tests/{project}/project")
+            else:
+                assert "extension.so" in listdir(f"hatch_cpp/tests/{project}/project")
+
+        # import
+        here = Path(__file__).parent / project
+        path.insert(0, str(here))
+        import project.extension
+
+        assert project.extension.hello() == "A string"

hatch_cpp/tests/test_project_cmake/pyproject.toml

@@ -29,7 +29,7 @@ packages = ["project"]
 packages = ["project"]
 
 [tool.hatch.build.hooks.hatch-cpp]
-verbose = true
+verbose = false
 
 [tool.hatch.build.hooks.hatch-cpp.cmake]
 root = "CMakeLists.txt"

hatch_cpp/tests/test_project_hatch_build/cpp/project/basic.cpp

@@ -0,0 +1,2 @@
+#include "project/basic.hpp"
+

hatch_cpp/tests/test_project_hatch_build/cpp/project/basic.hpp

@@ -0,0 +1,7 @@
+#pragma once
+#include <nanobind/nanobind.h>
+#include <nanobind/stl/string.h>
+
+NB_MODULE(extension, m) {
+    m.def("hello", []() { return "A string"; });
+}

hatch_cpp/tests/test_project_hatch_build/pyproject.toml

@@ -0,0 +1,36 @@
+[build-system]
+requires = ["hatchling>=1.20"]
+build-backend = "hatchling.build"
+
+[project]
+name = "hatch-cpp-test-project-nanobind"
+description = "Basic test project for hatch-cpp"
+version = "0.1.0"
+requires-python = ">=3.9"
+dependencies = [
+    "hatchling>=1.20",
+    "hatch-cpp",
+]
+
+[tool.hatch.build]
+artifacts = [
+    "project/*.dll",
+    "project/*.dylib",
+    "project/*.so",
+]
+
+[tool.hatch.build.sources]
+src = "/"
+
+[tool.hatch.build.targets.sdist]
+packages = ["project"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["project"]
+
+[tool.hatch.build.hooks.hatch-cpp]
+verbose = true
+libraries = [
+    # {name = "project/extension", sources = ["cpp/project/basic.cpp"], include-dirs = ["cpp"], binding = "nanobind"},
+    {name = "wrong", sources = ["wrong"], include-dirs = ["wrong"], binding = "generic"},
+]

hatch_cpp/toolchains/cmake.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from os import environ
 from pathlib import Path
 from sys import version_info
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Union
 
 from pydantic import BaseModel, Field
 
@@ -23,7 +23,7 @@ DefaultMSVCGenerator = {
 
 
 class HatchCppCmakeConfiguration(BaseModel):
-    root: Path
+    root: Optional[Path] = None
     build: Path = Field(default_factory=lambda: Path("build"))
     install: Optional[Path] = Field(default=None)
 
@@ -31,7 +31,7 @@ class HatchCppCmakeConfiguration(BaseModel):
     cmake_args: Dict[str, str] = Field(default_factory=dict)
     cmake_env_args: Dict[Platform, Dict[str, str]] = Field(default_factory=dict)
 
-    include_flags: Optional[Dict[str, Any]] = Field(default=None)
+    include_flags: Optional[Dict[str, Union[str, int, float, bool]]] = Field(default=None)
 
     def generate(self, config) -> Dict[str, Any]:
         commands = []

{hatch_cpp-0.1.9.dist-info → hatch_cpp-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.1.9
+Version: 0.2.0
 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
@@ -12,7 +12,6 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -20,7 +19,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.9
+Requires-Python: >=3.10
+Requires-Dist: hatch-build<0.5,>=0.4
 Requires-Dist: hatchling>=1.20
 Requires-Dist: pydantic
 Provides-Extra: develop
@@ -28,7 +28,7 @@ Requires-Dist: build; extra == 'develop'
 Requires-Dist: bump-my-version; extra == 'develop'
 Requires-Dist: check-manifest; extra == 'develop'
 Requires-Dist: codespell<2.5,>=2.4; extra == 'develop'
-Requires-Dist: hatch-build; extra == 'develop'
+Requires-Dist: hatch-build>=0.3.2; extra == 'develop'
 Requires-Dist: hatchling; extra == 'develop'
 Requires-Dist: mdformat-tables>=1; extra == 'develop'
 Requires-Dist: mdformat<1.1,>=0.7.22; extra == 'develop'
@@ -128,6 +128,20 @@ cmake_env_args = {} # env-specific cmake args to pass
 include_flags = {} # include flags to pass -D
 ```
 
+### CLI
+
+`hatch-cpp` is integrated with [`hatch-build`](https://github.com/python-project-templates/hatch-build) to allow easy configuration of options via command line:
+
+```bash
+hatch-build \
+    -- \
+    --verbose \
+    --platform linux \
+    --vcpkg.vcpkg a/path/to/vcpkg.json \
+    --libraries.0.binding pybind11 \
+    --libraries.0.include-dirs cpp,another-dir
+```
+
 ### Environment Variables
 
 `hatch-cpp` will respect standard environment variables for compiler control.

{hatch_cpp-0.1.9.dist-info → hatch_cpp-0.2.0.dist-info}/RECORD

@@ -1,8 +1,9 @@
-hatch_cpp/__init__.py,sha256=oKHiO4K6AqVX3CJNI-_Bg9N7-jM_vIcXsdrv8aTVCAM,114
+hatch_cpp/__init__.py,sha256=0H1fLq61dXqP3350HHLIwqt8Nb1zw8zIz5TsIkYHASQ,114
 hatch_cpp/config.py,sha256=8UIdlc6fHEBNgjmLZ1op3x-16BARxx4GJHPwAFQlOUw,3641
 hatch_cpp/hooks.py,sha256=SQkF5WJIgzw-8rvlTzuQvBqdP6K3fHgnh6CZOZFag50,203
-hatch_cpp/plugin.py,sha256=9y_cmH7cDFUJ5_xOj6ugVBerd5EdQo30T1FnZ5mmna8,4402
+hatch_cpp/plugin.py,sha256=pywarl9lNXMMYmYa0OMT2Q3VQGvViusaa0-tZbMA1W4,4523
 hatch_cpp/utils.py,sha256=lxd3U3aMYsTS6DYMc1y17MR16LzgRzv92f_xh87LSg8,297
+hatch_cpp/tests/test_hatch_build.py,sha256=q2IKTFi3Pq99UsOyL84V-C9VtFUs3ZcA9UlA8lpRW54,1553
 hatch_cpp/tests/test_projects.py,sha256=vs-kHdiHM7pCqM3oGQsSryq5blRi0HyK5QFfHxlJDi8,1773
 hatch_cpp/tests/test_structs.py,sha256=cpzbPLneEbEONzXmPS1S9PL9mbhya4udc4eqTpU9w6w,2576
 hatch_cpp/tests/test_project_basic/pyproject.toml,sha256=eqM1UVpNmJWDfsuO18ZG_VOV9I4tAWgsM5Dhf49X8Nc,694
@@ -11,7 +12,7 @@ hatch_cpp/tests/test_project_basic/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH
 hatch_cpp/tests/test_project_basic/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/tests/test_project_cmake/CMakeLists.txt,sha256=J6ijT9x9uSuisNEVIdFVgc_AstU9hbmIUbwvdjn_4GU,2795
 hatch_cpp/tests/test_project_cmake/Makefile,sha256=Vfr65pvnktWTUeuvpMWqIxDR-7V9MT4PQAyj-WHG_pI,4357
-hatch_cpp/tests/test_project_cmake/pyproject.toml,sha256=pu9RWhm_FY7KlcdOg2nmp-obnStnPJ04jW-bxei704w,814
+hatch_cpp/tests/test_project_cmake/pyproject.toml,sha256=judDNJ0qYM6-ocGXtUEHQlUzyj8GsF5qoJ-jPDsIAdA,815
 hatch_cpp/tests/test_project_cmake/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
 hatch_cpp/tests/test_project_cmake/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
 hatch_cpp/tests/test_project_cmake/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,6 +25,10 @@ hatch_cpp/tests/test_project_cmake_vcpkg/cpp/project/basic.cpp,sha256=gQ2nmdLqId
 hatch_cpp/tests/test_project_cmake_vcpkg/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
 hatch_cpp/tests/test_project_cmake_vcpkg/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/tests/test_project_cmake_vcpkg/project/include/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
+hatch_cpp/tests/test_project_hatch_build/pyproject.toml,sha256=CyOB1ZhiqqBQOZJoROVIRew66DVjoN2tIqBlQA-F_V8,812
+hatch_cpp/tests/test_project_hatch_build/cpp/project/basic.cpp,sha256=L4v9AUveWWQX8Z2GMRREsEGLz-A_NCeuX0KiyppDmbc,30
+hatch_cpp/tests/test_project_hatch_build/cpp/project/basic.hpp,sha256=AK2FKdlqBwH5jnRUdJXSbWvRr-gSVsUKSG0PiYNsW7A,155
+hatch_cpp/tests/test_project_hatch_build/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/tests/test_project_limited_api/pyproject.toml,sha256=k_2y7YpZP5I-KPvKOZLmnHqoKXVE2oVM8fjxtRKoTo0,726
 hatch_cpp/tests/test_project_limited_api/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
 hatch_cpp/tests/test_project_limited_api/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
@@ -50,11 +55,11 @@ hatch_cpp/tests/test_project_pybind_vcpkg/cpp/project/basic.cpp,sha256=MT3eCSQKr
 hatch_cpp/tests/test_project_pybind_vcpkg/cpp/project/basic.hpp,sha256=LZSfCfhLY_91MBOxtnvDk7DcceO-9GhCHKpMnAjGe18,146
 hatch_cpp/tests/test_project_pybind_vcpkg/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/toolchains/__init__.py,sha256=anza4tXKxauobWMOUrxX3sEO0qs7sp6VdLXhLae3vkY,64
-hatch_cpp/toolchains/cmake.py,sha256=_NyURVcVBjQH4cYDtBLNH6PNCVT88WiRCx70U7CNyKA,3282
+hatch_cpp/toolchains/cmake.py,sha256=VQYYqiOu0ZEF0IBuep35Xad7jryWy04-dHYYf7c0XgY,3331
 hatch_cpp/toolchains/common.py,sha256=nBAGQ9B5a7yNgOgohUCsbnDAJACrdQ8lt5dFyb7IXMs,10076
 hatch_cpp/toolchains/vcpkg.py,sha256=fx9lo5EH3HVqg9Fnh5EO67gNsAXcza9eZz4S-Y8piJ0,2097
-hatch_cpp-0.1.9.dist-info/METADATA,sha256=4_5RAtqq11Hp9ddwth9auEBEfpddcMQQ9z0VRKhM0Rk,5540
-hatch_cpp-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hatch_cpp-0.1.9.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
-hatch_cpp-0.1.9.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
-hatch_cpp-0.1.9.dist-info/RECORD,,
+hatch_cpp-0.2.0.dist-info/METADATA,sha256=MVd4nLoYpRqU8nWMxmX1bH5uCjdV2gdOUQX-Gh8UxYw,5906
+hatch_cpp-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hatch_cpp-0.2.0.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
+hatch_cpp-0.2.0.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
+hatch_cpp-0.2.0.dist-info/RECORD,,