hatch-cpp 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 from .config import *
 from .hooks import *

hatch_cpp/config.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from os import environ, system as system_call
 from pathlib import Path
-from typing import List, Optional
 
 from pkn import getSimpleLogger
 from pydantic import BaseModel, Field, model_validator
@@ -21,13 +20,13 @@ log = getSimpleLogger("hatch_cpp")
 class HatchCppBuildConfig(BaseModel):
     """Build config values for Hatch C++ Builder."""
 
-    verbose: Optional[bool] = Field(default=False)
-    skip: Optional[bool] = Field(default=False)
-    name: Optional[str] = Field(default=None)
-    libraries: List[HatchCppLibrary] = Field(default_factory=list)
-    cmake: Optional[HatchCppCmakeConfiguration] = Field(default=None)
-    platform: Optional[HatchCppPlatform] = Field(default_factory=HatchCppPlatform.default)
-    vcpkg: Optional[HatchCppVcpkgConfiguration] = Field(default_factory=HatchCppVcpkgConfiguration)
+    verbose: bool | None = Field(default=False)
+    skip: bool | None = Field(default=False)
+    name: str | None = Field(default=None)
+    libraries: list[HatchCppLibrary] = Field(default_factory=list)
+    cmake: HatchCppCmakeConfiguration | None = Field(default=None)
+    platform: HatchCppPlatform | None = Field(default_factory=HatchCppPlatform.default)
+    vcpkg: HatchCppVcpkgConfiguration | None = Field(default_factory=HatchCppVcpkgConfiguration)
 
     @model_validator(mode="wrap")
     @classmethod
@@ -56,9 +55,9 @@ class HatchCppBuildConfig(BaseModel):
 
 class HatchCppBuildPlan(HatchCppBuildConfig):
     build_type: BuildType = "release"
-    commands: List[str] = Field(default_factory=list)
+    commands: list[str] = Field(default_factory=list)
 
-    _active_toolchains: List[Toolchain] = []
+    _active_toolchains: list[Toolchain] = []
 
     def generate(self):
         self.commands = []

hatch_cpp/hooks.py

@@ -1,10 +1,8 @@
-from typing import Type
-
 from hatchling.plugin import hookimpl
 
 from .plugin import HatchCppBuildHook
 
 
 @hookimpl
-def hatch_register_build_hook() -> Type[HatchCppBuildHook]:
+def hatch_register_build_hook() -> type[HatchCppBuildHook]:
     return HatchCppBuildHook

hatch_cpp/plugin.py

@@ -82,7 +82,7 @@ class HatchCppBuildHook(BuildHookInterface[HatchCppBuildConfig]):
                 os_name = "linux"
             else:
                 os_name = "win"
-            if all([lib.py_limited_api for lib in build_plan.libraries]):
+            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}"

hatch_cpp/tests/test_project_cmake/CMakeLists.txt

@@ -70,7 +70,7 @@ else()
 endif()
 
 
-find_package(Python ${CSP_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(Python ${HATCH_CPP_TEST_PROJECT_BASIC_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
 
 include_directories("${CMAKE_SOURCE_DIR}/cpp")
 

hatch_cpp/tests/test_project_cmake_vcpkg/CMakeLists.txt

@@ -70,7 +70,7 @@ else()
 endif()
 
 
-find_package(Python ${CSP_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(Python ${HATCH_CPP_TEST_PROJECT_BASIC_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
 
 include_directories("${CMAKE_SOURCE_DIR}/cpp")
 

hatch_cpp/tests/test_projects.py

@@ -14,7 +14,6 @@ class TestProject:
         [
             "test_project_basic",
             "test_project_override_classes",
-            "test_project_override_classes",
             "test_project_override_toolchain",
             "test_project_pybind",
             "test_project_pybind_vcpkg",

hatch_cpp/tests/test_vcpkg_ref.py

@@ -153,6 +153,27 @@ class TestVcpkgGenerate:
         assert not any("checkout" in cmd for cmd in commands)
         assert any("git clone" in cmd for cmd in commands)
 
+    def test_generate_uses_posix_command_paths(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_triplet="x64-linux")
+        commands = cfg.generate(None)
+
+        assert "./vcpkg/bootstrap-vcpkg.sh" in commands
+        assert "./vcpkg/vcpkg install --triplet x64-linux" 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")
+        self._make_vcpkg_env(tmp_path)
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_triplet="x64-windows-static-md")
+        commands = cfg.generate(None)
+
+        assert r"vcpkg\bootstrap-vcpkg.bat" in commands
+        assert r"vcpkg\vcpkg.exe install --triplet x64-windows-static-md" in commands
+
     def test_generate_skips_clone_when_vcpkg_root_exists(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
         self._make_vcpkg_env(tmp_path)

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, Union
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -23,17 +23,17 @@ DefaultMSVCGenerator = {
 
 
 class HatchCppCmakeConfiguration(BaseModel):
-    root: Optional[Path] = None
+    root: Path | None = None
     build: Path = Field(default_factory=lambda: Path("build"))
-    install: Optional[Path] = Field(default=None)
+    install: Path | None = Field(default=None)
 
-    cmake_arg_prefix: Optional[str] = Field(default=None)
-    cmake_args: Dict[str, str] = Field(default_factory=dict)
-    cmake_env_args: Dict[Platform, Dict[str, str]] = Field(default_factory=dict)
+    cmake_arg_prefix: str | None = Field(default=None)
+    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, Union[str, int, float, bool]]] = Field(default=None)
+    include_flags: dict[str, str | int | float | bool] | None = Field(default=None)
 
-    def generate(self, config) -> Dict[str, Any]:
+    def generate(self, config) -> dict[str, Any]:
         commands = []
 
         # Derive prefix

hatch_cpp/toolchains/common.py

@@ -6,20 +6,20 @@ from re import match
 from shutil import which
 from sys import base_exec_prefix, exec_prefix, executable, platform as sys_platform
 from sysconfig import get_config_var, get_path
-from typing import Any, List, Literal, Optional
+from typing import Any, Literal
 
 from pydantic import AliasChoices, BaseModel, Field, field_validator, model_validator
 
 __all__ = (
+    "Binding",
     "BuildType",
     "CompilerToolchain",
-    "Toolchain",
+    "HatchCppLibrary",
+    "HatchCppPlatform",
     "Language",
-    "Binding",
     "Platform",
     "PlatformDefaults",
-    "HatchCppLibrary",
-    "HatchCppPlatform",
+    "Toolchain",
     "_normalize_rpath",
 )
 
@@ -41,63 +41,62 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
     """A C++ library."""
 
     name: str
-    sources: List[str]
+    sources: list[str]
     language: Language = "c++"
 
     binding: Binding = "cpython"
-    std: Optional[str] = None
+    std: str | None = None
 
-    include_dirs: List[str] = Field(default_factory=list, alias=AliasChoices("include_dirs", "include-dirs"))
-    include_dirs_linux: List[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_linux", "include-dirs-linux"))
-    include_dirs_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_darwin", "include-dirs-darwin"))
-    include_dirs_win32: List[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_win32", "include-dirs-win32"))
+    include_dirs: list[str] = Field(default_factory=list, alias=AliasChoices("include_dirs", "include-dirs"))
+    include_dirs_linux: list[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_linux", "include-dirs-linux"))
+    include_dirs_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_darwin", "include-dirs-darwin"))
+    include_dirs_win32: list[str] = Field(default_factory=list, alias=AliasChoices("include_dirs_win32", "include-dirs-win32"))
 
-    library_dirs: List[str] = Field(default_factory=list, alias=AliasChoices("library_dirs", "library-dirs"))
-    library_dirs_linux: List[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_linux", "library-dirs-linux"))
-    library_dirs_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_darwin", "library-dirs-darwin"))
-    library_dirs_win32: List[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_win32", "library-dirs-win32"))
+    library_dirs: list[str] = Field(default_factory=list, alias=AliasChoices("library_dirs", "library-dirs"))
+    library_dirs_linux: list[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_linux", "library-dirs-linux"))
+    library_dirs_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_darwin", "library-dirs-darwin"))
+    library_dirs_win32: list[str] = Field(default_factory=list, alias=AliasChoices("library_dirs_win32", "library-dirs-win32"))
 
-    libraries: List[str] = Field(default_factory=list)
-    libraries_linux: List[str] = Field(default_factory=list, alias=AliasChoices("libraries_linux", "libraries-linux"))
-    libraries_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("libraries_darwin", "libraries-darwin"))
-    libraries_win32: List[str] = Field(default_factory=list, alias=AliasChoices("libraries_win32", "libraries-win32"))
+    libraries: list[str] = Field(default_factory=list)
+    libraries_linux: list[str] = Field(default_factory=list, alias=AliasChoices("libraries_linux", "libraries-linux"))
+    libraries_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("libraries_darwin", "libraries-darwin"))
+    libraries_win32: list[str] = Field(default_factory=list, alias=AliasChoices("libraries_win32", "libraries-win32"))
 
-    extra_compile_args: List[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args", "extra-compile-args"))
-    extra_compile_args_linux: List[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_linux", "extra-compile-args-linux"))
-    extra_compile_args_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_darwin", "extra-compile-args-darwin"))
-    extra_compile_args_win32: List[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_win32", "extra-compile-args-win32"))
+    extra_compile_args: list[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args", "extra-compile-args"))
+    extra_compile_args_linux: list[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_linux", "extra-compile-args-linux"))
+    extra_compile_args_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_darwin", "extra-compile-args-darwin"))
+    extra_compile_args_win32: list[str] = Field(default_factory=list, alias=AliasChoices("extra_compile_args_win32", "extra-compile-args-win32"))
 
-    extra_link_args: List[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args", "extra-link-args"))
-    extra_link_args_linux: List[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_linux", "extra-link-args-linux"))
-    extra_link_args_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_darwin", "extra-link-args-darwin"))
-    extra_link_args_win32: List[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_win32", "extra-link-args-win32"))
+    extra_link_args: list[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args", "extra-link-args"))
+    extra_link_args_linux: list[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_linux", "extra-link-args-linux"))
+    extra_link_args_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_darwin", "extra-link-args-darwin"))
+    extra_link_args_win32: list[str] = Field(default_factory=list, alias=AliasChoices("extra_link_args_win32", "extra-link-args-win32"))
 
-    extra_objects: List[str] = Field(default_factory=list, alias=AliasChoices("extra_objects", "extra-objects"))
-    extra_objects_linux: List[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_linux", "extra-objects-linux"))
-    extra_objects_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_darwin", "extra-objects-darwin"))
-    extra_objects_win32: List[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_win32", "extra-objects-win32"))
+    extra_objects: list[str] = Field(default_factory=list, alias=AliasChoices("extra_objects", "extra-objects"))
+    extra_objects_linux: list[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_linux", "extra-objects-linux"))
+    extra_objects_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_darwin", "extra-objects-darwin"))
+    extra_objects_win32: list[str] = Field(default_factory=list, alias=AliasChoices("extra_objects_win32", "extra-objects-win32"))
 
-    define_macros: List[str] = Field(default_factory=list, alias=AliasChoices("define_macros", "define-macros"))
-    define_macros_linux: List[str] = Field(default_factory=list, alias=AliasChoices("define_macros_linux", "define-macros-linux"))
-    define_macros_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("define_macros_darwin", "define-macros-darwin"))
-    define_macros_win32: List[str] = Field(default_factory=list, alias=AliasChoices("define_macros_win32", "define-macros-win32"))
+    define_macros: list[str] = Field(default_factory=list, alias=AliasChoices("define_macros", "define-macros"))
+    define_macros_linux: list[str] = Field(default_factory=list, alias=AliasChoices("define_macros_linux", "define-macros-linux"))
+    define_macros_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("define_macros_darwin", "define-macros-darwin"))
+    define_macros_win32: list[str] = Field(default_factory=list, alias=AliasChoices("define_macros_win32", "define-macros-win32"))
 
-    undef_macros: List[str] = Field(default_factory=list, alias=AliasChoices("undef_macros", "undef-macros"))
-    undef_macros_linux: List[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_linux", "undef-macros-linux"))
-    undef_macros_darwin: List[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_darwin", "undef-macros-darwin"))
-    undef_macros_win32: List[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_win32", "undef-macros-win32"))
+    undef_macros: list[str] = Field(default_factory=list, alias=AliasChoices("undef_macros", "undef-macros"))
+    undef_macros_linux: list[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_linux", "undef-macros-linux"))
+    undef_macros_darwin: list[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_darwin", "undef-macros-darwin"))
+    undef_macros_win32: list[str] = Field(default_factory=list, alias=AliasChoices("undef_macros_win32", "undef-macros-win32"))
 
-    export_symbols: List[str] = Field(default_factory=list, alias=AliasChoices("export_symbols", "export-symbols"))
-    depends: List[str] = Field(default_factory=list)
+    export_symbols: list[str] = Field(default_factory=list, alias=AliasChoices("export_symbols", "export-symbols"))
+    depends: list[str] = Field(default_factory=list)
 
-    py_limited_api: Optional[str] = Field(default="", alias=AliasChoices("py_limited_api", "py-limited-api"))
+    py_limited_api: str | None = Field(default="", alias=AliasChoices("py_limited_api", "py-limited-api"))
 
     @field_validator("py_limited_api", mode="before")
     @classmethod
     def check_py_limited_api(cls, value: Any) -> Any:
-        if value:
-            if not match(r"cp3\d", value):
-                raise ValueError("py-limited-api must be in the form of cp3X")
+        if value and not match(r"cp3\d", value):
+            raise ValueError("py-limited-api must be in the form of cp3X")
         return value
 
     def get_qualified_name(self, platform):
@@ -122,7 +121,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             raise ValueError("Generic binding can not support Py_LIMITED_API")
         return self
 
-    def get_effective_link_args(self, platform: Platform) -> List[str]:
+    def get_effective_link_args(self, platform: Platform) -> list[str]:
         """Get link args merged with platform-specific link args."""
         args = list(self.extra_link_args)
         if platform == "linux":
@@ -133,7 +132,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             args.extend(self.extra_link_args_win32)
         return args
 
-    def get_effective_include_dirs(self, platform: Platform) -> List[str]:
+    def get_effective_include_dirs(self, platform: Platform) -> list[str]:
         """Get include dirs merged with platform-specific include dirs."""
         dirs = list(self.include_dirs)
         if platform == "linux":
@@ -144,7 +143,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             dirs.extend(self.include_dirs_win32)
         return dirs
 
-    def get_effective_library_dirs(self, platform: Platform) -> List[str]:
+    def get_effective_library_dirs(self, platform: Platform) -> list[str]:
         """Get library dirs merged with platform-specific library dirs."""
         dirs = list(self.library_dirs)
         if platform == "linux":
@@ -155,7 +154,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             dirs.extend(self.library_dirs_win32)
         return dirs
 
-    def get_effective_libraries(self, platform: Platform) -> List[str]:
+    def get_effective_libraries(self, platform: Platform) -> list[str]:
         """Get libraries merged with platform-specific libraries."""
         libs = list(self.libraries)
         if platform == "linux":
@@ -166,7 +165,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             libs.extend(self.libraries_win32)
         return libs
 
-    def get_effective_compile_args(self, platform: Platform) -> List[str]:
+    def get_effective_compile_args(self, platform: Platform) -> list[str]:
         """Get compile args merged with platform-specific compile args."""
         args = list(self.extra_compile_args)
         if platform == "linux":
@@ -177,7 +176,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             args.extend(self.extra_compile_args_win32)
         return args
 
-    def get_effective_extra_objects(self, platform: Platform) -> List[str]:
+    def get_effective_extra_objects(self, platform: Platform) -> list[str]:
         """Get extra objects merged with platform-specific extra objects."""
         objs = list(self.extra_objects)
         if platform == "linux":
@@ -188,7 +187,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             objs.extend(self.extra_objects_win32)
         return objs
 
-    def get_effective_define_macros(self, platform: Platform) -> List[str]:
+    def get_effective_define_macros(self, platform: Platform) -> list[str]:
         """Get define macros merged with platform-specific define macros."""
         macros = list(self.define_macros)
         if platform == "linux":
@@ -199,7 +198,7 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
             macros.extend(self.define_macros_win32)
         return macros
 
-    def get_effective_undef_macros(self, platform: Platform) -> List[str]:
+    def get_effective_undef_macros(self, platform: Platform) -> list[str]:
         """Get undef macros merged with platform-specific undef macros."""
         macros = list(self.undef_macros)
         if platform == "linux":
@@ -274,12 +273,11 @@ class HatchCppPlatform(BaseModel):
     @classmethod
     def validate_model(cls, data, handler):
         model = handler(data)
-        if which("ccache") and not model.disable_ccache:
-            if model.toolchain in ["gcc", "clang"]:
-                if not model.cc.startswith("ccache "):
-                    model.cc = f"ccache {model.cc}"
-                if not model.cxx.startswith("ccache "):
-                    model.cxx = f"ccache {model.cxx}"
+        if which("ccache") 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 "):
+                model.cxx = f"ccache {model.cxx}"
         return model
 
     @staticmethod
@@ -316,7 +314,7 @@ class HatchCppPlatform(BaseModel):
             if not library.std:
                 library.std = "c++17"
             library.sources.append(str(Path(nanobind.include_dir()).parent / "src" / "nb_combined.cpp"))
-            effective_include_dirs.append(str((Path(nanobind.include_dir()).parent / "ext" / "robin_map" / "include")))
+            effective_include_dirs.append(str(Path(nanobind.include_dir()).parent / "ext" / "robin_map" / "include"))
 
         if library.py_limited_api:
             if library.binding == "pybind11":
@@ -367,20 +365,7 @@ class HatchCppPlatform(BaseModel):
         # Normalize rpath values ($ORIGIN <-> @loader_path) and escape for shell
         effective_link_args = [_normalize_rpath(arg, self.platform) for arg in effective_link_args]
 
-        if self.toolchain == "gcc":
-            flags += " -shared"
-            flags += " " + " ".join(effective_link_args)
-            flags += " " + " ".join(effective_extra_objects)
-            flags += " " + " ".join(f"-l{lib}" for lib in effective_libraries)
-            flags += " " + " ".join(f"-L{lib}" for lib in effective_library_dirs)
-            flags += f" -o {library.get_qualified_name(self.platform)}"
-            if self.platform == "darwin":
-                flags += " -undefined dynamic_lookup"
-            if "mold" in self.ld:
-                flags += f" -fuse-ld={self.ld}"
-            elif "lld" in self.ld:
-                flags += " -fuse-ld=lld"
-        elif self.toolchain == "clang":
+        if self.toolchain == "gcc" or self.toolchain == "clang":
             flags += " -shared"
             flags += " " + " ".join(effective_link_args)
             flags += " " + " ".join(effective_extra_objects)
@@ -411,7 +396,7 @@ class HatchCppPlatform(BaseModel):
             ]
             for libs_path in python_libs_paths:
                 if libs_path.exists():
-                    flags += f" /LIBPATH:{str(libs_path)}"
+                    flags += f" /LIBPATH:{libs_path!s}"
                     break
             flags += " " + " ".join(f"{lib}.lib" for lib in effective_libraries)
             flags += " " + " ".join(f"/LIBPATH:{lib}" for lib in effective_library_dirs)

hatch_cpp/toolchains/vcpkg.py

@@ -5,7 +5,7 @@ import subprocess
 from pathlib import Path
 from platform import machine as platform_machine
 from sys import platform as sys_platform
-from typing import Literal, Optional
+from typing import Literal
 
 from pydantic import BaseModel, Field
 
@@ -40,7 +40,7 @@ VcpkgPlatformDefaults = {
 }
 
 
-def _read_vcpkg_ref_from_gitmodules(vcpkg_root: Path) -> Optional[str]:
+def _read_vcpkg_ref_from_gitmodules(vcpkg_root: Path) -> str | None:
     """Read the branch/ref for vcpkg from .gitmodules if it exists.
 
     Looks for a submodule whose path matches ``vcpkg_root`` and returns
@@ -61,11 +61,11 @@ def _read_vcpkg_ref_from_gitmodules(vcpkg_root: Path) -> Optional[str]:
 
 
 class HatchCppVcpkgConfiguration(BaseModel):
-    vcpkg: Optional[str] = Field(default="vcpkg.json")
-    vcpkg_root: Optional[Path] = Field(default=Path("vcpkg"))
-    vcpkg_repo: Optional[str] = Field(default="https://github.com/microsoft/vcpkg.git")
-    vcpkg_triplet: Optional[VcpkgTriplet] = Field(default=None)
-    vcpkg_ref: Optional[str] = Field(
+    vcpkg: str | None = Field(default="vcpkg.json")
+    vcpkg_root: Path | None = Field(default=Path("vcpkg"))
+    vcpkg_repo: str | None = Field(default="https://github.com/microsoft/vcpkg.git")
+    vcpkg_triplet: VcpkgTriplet | None = Field(default=None)
+    vcpkg_ref: str | None = Field(
         default=None,
         description="Branch, tag, or commit SHA to checkout after cloning vcpkg. "
         "If not set, falls back to the branch specified in .gitmodules for the vcpkg submodule.",
@@ -73,7 +73,7 @@ class HatchCppVcpkgConfiguration(BaseModel):
 
     # TODO: overlay
 
-    def _resolve_vcpkg_ref(self) -> Optional[str]:
+    def _resolve_vcpkg_ref(self) -> str | None:
         """Return the ref to checkout: explicit config takes priority, then .gitmodules."""
         if self.vcpkg_ref is not None:
             return self.vcpkg_ref
@@ -87,6 +87,11 @@ class HatchCppVcpkgConfiguration(BaseModel):
             return self.vcpkg_root / "vcpkg.exe"
         return self.vcpkg_root / "vcpkg"
 
+    def _command_path(self, path: Path) -> str:
+        if sys_platform == "win32":
+            return str(path).replace("/", "\\")
+        return f"./{path}"
+
     def _delete_dir_command(self, path: Path) -> str:
         if sys_platform == "win32":
             return f'rmdir /s /q "{path}"'
@@ -109,7 +114,7 @@ class HatchCppVcpkgConfiguration(BaseModel):
         if ref is not None:
             commands.append(f"git -C {self.vcpkg_root} checkout {ref}")
 
-        commands.append(f"./{self._bootstrap_script_path()}")
+        commands.append(self._command_path(self._bootstrap_script_path()))
         return commands
 
     def generate(self, config):
@@ -134,11 +139,11 @@ class HatchCppVcpkgConfiguration(BaseModel):
                 else:
                     vcpkg_executable = self._vcpkg_executable_path()
                     if not vcpkg_executable.exists():
-                        commands.append(f"./{bootstrap_script}")
+                        commands.append(self._command_path(bootstrap_script))
                     elif not self._is_vcpkg_working():
                         commands.append(self._delete_dir_command(vcpkg_root))
                         commands.extend(self._clone_checkout_bootstrap_commands())
 
-            commands.append(f"./{self.vcpkg_root / 'vcpkg'} install --triplet {self.vcpkg_triplet}")
+            commands.append(f"{self._command_path(self._vcpkg_executable_path())} install --triplet {self.vcpkg_triplet}")
 
         return commands

hatch_cpp/utils.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from functools import lru_cache
+from functools import cache
 
 from pydantic import ImportString, TypeAdapter
 
 _import_string_adapter = TypeAdapter(ImportString)
 
 
-@lru_cache(maxsize=None)
+@cache
 def import_string(input_string: str):
     return _import_string_adapter.validate_python(input_string)

{hatch_cpp-0.4.0.dist-info → hatch_cpp-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.4.0
+Version: 0.4.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
@@ -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.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{hatch_cpp-0.4.0.dist-info → hatch_cpp-0.4.1.dist-info}/RECORD

@@ -1,25 +1,25 @@
-hatch_cpp/__init__.py,sha256=QnAS8UARqj-I35tzWD70JsB-xoePWVJxNMNgBt0Y_PU,114
-hatch_cpp/config.py,sha256=aRmcRyrPR7LsEOBjrF9pkOM3ldiykuYRmD73CB3k9MY,4512
-hatch_cpp/hooks.py,sha256=SQkF5WJIgzw-8rvlTzuQvBqdP6K3fHgnh6CZOZFag50,203
-hatch_cpp/plugin.py,sha256=NcIDi7c9KH-_RkPeeCgWKoH5InIjw2eECswazwvGl_c,4304
-hatch_cpp/utils.py,sha256=lxd3U3aMYsTS6DYMc1y17MR16LzgRzv92f_xh87LSg8,297
+hatch_cpp/__init__.py,sha256=obN0qecZxCCF7GZRXEfOmWIF0PaLdpwOFr04l0P5tzw,114
+hatch_cpp/config.py,sha256=BlLr2hivhlp-1S6aSbJlHPWHtxMGvF0SMR-dJRPXQro,4460
+hatch_cpp/hooks.py,sha256=OfcAgx6gVL0ukvpyln5OTiwhqxObJ0b4FKr850fYP3I,178
+hatch_cpp/plugin.py,sha256=8Y4d6FMQocVzoNEWLbryeY1Wr_dUxQ3DJjiQHAjj4zg,4302
+hatch_cpp/utils.py,sha256=dxLCyoMLC7C0trJ8mlvwA5-JzVNt2JI9JSGYcHTHBY4,275
 hatch_cpp/tests/test_hatch_build.py,sha256=q2IKTFi3Pq99UsOyL84V-C9VtFUs3ZcA9UlA8lpRW54,1553
 hatch_cpp/tests/test_platform_specific.py,sha256=SRKAojh6PkwKZnEj8SjvfFa_Dy8NSKw4R82ol8O1TZs,20126
-hatch_cpp/tests/test_projects.py,sha256=v05hZI9kfBCU6CpWXixyetNy92nC4Dajtxyj03lLjkQ,2168
+hatch_cpp/tests/test_projects.py,sha256=WAV8OAV-4Xp4o91S1nlj9ptmpexlXEIXnfSozt0mhCI,2123
 hatch_cpp/tests/test_structs.py,sha256=zmNtAV1bojvJM6gatjDtvqrAeUpKzpfmLrzgFTZLo8U,12028
-hatch_cpp/tests/test_vcpkg_ref.py,sha256=wcfbFp8Tc6E2hiQPlextdno0NYrA1yljRSRUIQEj0mM,9969
+hatch_cpp/tests/test_vcpkg_ref.py,sha256=1inxhiDD_QQThKe804UZ-SZkh5lcUUWjzb63ATZ9c9Y,10854
 hatch_cpp/tests/test_project_basic/pyproject.toml,sha256=eqM1UVpNmJWDfsuO18ZG_VOV9I4tAWgsM5Dhf49X8Nc,694
 hatch_cpp/tests/test_project_basic/cpp/project/basic.cpp,sha256=gQ2nmdLqIdgaqxSKvkN_vbp6Iv_pAoVIHETXPRnALb0,117
 hatch_cpp/tests/test_project_basic/cpp/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
 hatch_cpp/tests/test_project_basic/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hatch_cpp/tests/test_project_cmake/CMakeLists.txt,sha256=OvJT0L18qH6zRm3Uw8pO6085WLY1HMvBgq6zIcFuQvU,2580
+hatch_cpp/tests/test_project_cmake/CMakeLists.txt,sha256=_62H73yB-hJUCj_PiOGZUTauFB25q0h1TOQ9n855A74,2605
 hatch_cpp/tests/test_project_cmake/Makefile,sha256=Vfr65pvnktWTUeuvpMWqIxDR-7V9MT4PQAyj-WHG_pI,4357
 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
 hatch_cpp/tests/test_project_cmake/project/include/project/basic.hpp,sha256=SO5GhPj8k3RzWrfH37lFSDc8w1Vf3yqTUhxmr1hnoko,422
-hatch_cpp/tests/test_project_cmake_vcpkg/CMakeLists.txt,sha256=OvJT0L18qH6zRm3Uw8pO6085WLY1HMvBgq6zIcFuQvU,2580
+hatch_cpp/tests/test_project_cmake_vcpkg/CMakeLists.txt,sha256=_62H73yB-hJUCj_PiOGZUTauFB25q0h1TOQ9n855A74,2605
 hatch_cpp/tests/test_project_cmake_vcpkg/Makefile,sha256=Vfr65pvnktWTUeuvpMWqIxDR-7V9MT4PQAyj-WHG_pI,4357
 hatch_cpp/tests/test_project_cmake_vcpkg/pyproject.toml,sha256=pu9RWhm_FY7KlcdOg2nmp-obnStnPJ04jW-bxei704w,814
 hatch_cpp/tests/test_project_cmake_vcpkg/vcpkg.json,sha256=3D_Mm48_-srxYzbdHNCVO00eFLLGZfsFfL6IMcK0x3E,162
@@ -57,11 +57,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=yUMw6LzmasjRiJfxN98b-E9fDxUbM0-mz-RL0O7IVag,3748
-hatch_cpp/toolchains/common.py,sha256=O6eb5qoo9GArI4MB4cLL1z6UnA4rbWxQ5VUIHJmbHBQ,20423
-hatch_cpp/toolchains/vcpkg.py,sha256=fBBModZOL49yJH8971zsOuuRPgTnmR2qvU_0AdT__DY,5233
-hatch_cpp-0.4.0.dist-info/METADATA,sha256=puWLBhQOtranOGnNuD83YJl2li5CHAYaYmBaPm2iYd0,9889
-hatch_cpp-0.4.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-hatch_cpp-0.4.0.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
-hatch_cpp-0.4.0.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
-hatch_cpp-0.4.0.dist-info/RECORD,,
+hatch_cpp/toolchains/cmake.py,sha256=9fOGXuJ4bpkKjU789GApK59WS4iZQNQK19Q_Zq_Byb4,3709
+hatch_cpp/toolchains/common.py,sha256=RoPfzuNCRWoqzpocymS_mhincOZZjKa0WVCLuckZijg,19704
+hatch_cpp/toolchains/vcpkg.py,sha256=N9iG9A37VkHRswfq1Fv4WWGxdRQgPB0ALQ1iGyork3w,5410
+hatch_cpp-0.4.1.dist-info/METADATA,sha256=Yzq7UrWCdfAM7d0prW2WFzT4bqVKJt_oP4fhdXGYGPw,9838
+hatch_cpp-0.4.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+hatch_cpp-0.4.1.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
+hatch_cpp-0.4.1.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
+hatch_cpp-0.4.1.dist-info/RECORD,,

{hatch_cpp-0.4.0.dist-info → hatch_cpp-0.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.30.1
+Generator: hatchling 1.31.0
 Root-Is-Purelib: true
 Tag: py3-none-any