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

hatch_cpp/__init__.py

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

hatch_cpp/tests/test_project_cmake/CMakeLists.txt

@@ -71,19 +71,11 @@ endif()
 
 
 find_package(Python ${CSP_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
-link_directories(${Python_LIBRARY_DIRS})
-include_directories(${Python_INCLUDE_DIRS})
-
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
-if(NOT WIN32)
-    set(CMAKE_SHARED_LIBRARY_SUFFIX .so)
-else()
-    set(CMAKE_SHARED_LIBRARY_SUFFIX .pyd)
-endif()
 
 include_directories("${CMAKE_SOURCE_DIR}/cpp")
 
-add_library(extension SHARED cpp/project/basic.cpp)
+python_add_library(extension MODULE WITH_SOABI cpp/project/basic.cpp)
+
 set_target_properties(extension PROPERTIES PUBLIC_HEADER cpp/project/basic.hpp)
 install(TARGETS extension
         PUBLIC_HEADER DESTINATION project/include/project

hatch_cpp/tests/test_project_cmake_vcpkg/CMakeLists.txt

@@ -71,19 +71,11 @@ endif()
 
 
 find_package(Python ${CSP_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development.Module)
-link_directories(${Python_LIBRARY_DIRS})
-include_directories(${Python_INCLUDE_DIRS})
-
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
-if(NOT WIN32)
-    set(CMAKE_SHARED_LIBRARY_SUFFIX .so)
-else()
-    set(CMAKE_SHARED_LIBRARY_SUFFIX .pyd)
-endif()
 
 include_directories("${CMAKE_SOURCE_DIR}/cpp")
 
-add_library(extension SHARED cpp/project/basic.cpp)
+python_add_library(extension MODULE WITH_SOABI cpp/project/basic.cpp)
+
 set_target_properties(extension PROPERTIES PUBLIC_HEADER cpp/project/basic.hpp)
 install(TARGETS extension
         PUBLIC_HEADER DESTINATION project/include/project

hatch_cpp/tests/test_projects.py

@@ -1,8 +1,9 @@
-from os import listdir
+import contextlib
+from os import listdir, remove
 from pathlib import Path
-from shutil import rmtree
 from subprocess import check_call
 from sys import modules, path, platform
+from sysconfig import get_config_var
 
 import pytest
 
@@ -24,9 +25,17 @@ class TestProject:
         ],
     )
     def test_basic(self, project):
+
+        suffix_ext = get_config_var("EXT_SUFFIX")
+
         # cleanup
-        rmtree(f"hatch_cpp/tests/{project}/project/extension.so", ignore_errors=True)
-        rmtree(f"hatch_cpp/tests/{project}/project/extension.pyd", ignore_errors=True)
+        with contextlib.suppress(FileNotFoundError):
+            remove(f"hatch_cpp/tests/{project}/project/extension.so")
+        with contextlib.suppress(FileNotFoundError):
+            remove(f"hatch_cpp/tests/{project}/project/extension.pyd")
+        with contextlib.suppress(FileNotFoundError):
+            remove(f"hatch_cpp/tests/{project}/project/extension{suffix_ext}")
+
         modules.pop("project", None)
         modules.pop("project.extension", None)
 
@@ -40,14 +49,14 @@ class TestProject:
         )
 
         # assert built
-
+        project_dir_content = listdir(f"hatch_cpp/tests/{project}/project")
         if project == "test_project_limited_api" and platform != "win32":
-            assert "extension.abi3.so" in listdir(f"hatch_cpp/tests/{project}/project")
+            assert "extension.abi3.so" in project_dir_content
         else:
             if platform == "win32":
-                assert "extension.pyd" in listdir(f"hatch_cpp/tests/{project}/project")
+                assert "extension.pyd" in project_dir_content or f"extension{suffix_ext}" in project_dir_content
             else:
-                assert "extension.so" in listdir(f"hatch_cpp/tests/{project}/project")
+                assert "extension.so" in project_dir_content or f"extension{suffix_ext}" in project_dir_content
 
         # import
         here = Path(__file__).parent / project

hatch_cpp/tests/test_vcpkg_ref.py

@@ -156,14 +156,66 @@ class TestVcpkgGenerate:
     def test_generate_skips_clone_when_vcpkg_root_exists(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
         self._make_vcpkg_env(tmp_path)
-        (tmp_path / "vcpkg").mkdir()
+        vcpkg_root = tmp_path / "vcpkg"
+        vcpkg_root.mkdir()
+        # Existing bootstrap script and executable mean no clone/bootstrap is needed.
+        (vcpkg_root / "bootstrap-vcpkg.sh").write_text("#!/bin/sh\nexit 0\n")
+        (vcpkg_root / "vcpkg").write_text("#!/bin/sh\nexit 0\n")
 
         cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        monkeypatch.setattr(cfg, "_is_vcpkg_working", lambda: True)
         commands = cfg.generate(None)
 
-        # When vcpkg_root already exists, no clone or checkout happens
+        # When vcpkg_root already exists with a working executable, no clone or bootstrap happens.
         assert not any("git clone" in cmd for cmd in commands)
         assert not any("checkout" in cmd for cmd in commands)
+        assert not any("bootstrap-vcpkg" in cmd for cmd in commands)
+        assert any("vcpkg" in cmd and "install" in cmd for cmd in commands)
+
+    def test_generate_reclones_when_vcpkg_root_exists_but_empty(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+        (tmp_path / "vcpkg").mkdir()
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        commands = cfg.generate(None)
+
+        assert any(cmd.startswith('rm -rf "vcpkg"') for cmd in commands)
+        assert any("git clone" in cmd for cmd in commands)
+        assert any("checkout 2024.01.12" in cmd for cmd in commands)
+        assert any("bootstrap-vcpkg" in cmd for cmd in commands)
+        assert any("vcpkg" in cmd and "install" in cmd for cmd in commands)
+
+    def test_generate_bootstraps_when_vcpkg_executable_missing(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+        vcpkg_root = tmp_path / "vcpkg"
+        vcpkg_root.mkdir()
+        (vcpkg_root / "bootstrap-vcpkg.sh").write_text("#!/bin/sh\nexit 0\n")
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        commands = cfg.generate(None)
+
+        assert not any("git clone" in cmd for cmd in commands)
+        assert any("bootstrap-vcpkg" in cmd for cmd in commands)
+        assert any("vcpkg" in cmd and "install" in cmd for cmd in commands)
+
+    def test_generate_reclones_when_vcpkg_exists_but_not_working(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+        vcpkg_root = tmp_path / "vcpkg"
+        vcpkg_root.mkdir()
+        (vcpkg_root / "bootstrap-vcpkg.sh").write_text("#!/bin/sh\nexit 0\n")
+        (vcpkg_root / "vcpkg").write_text("#!/bin/sh\nexit 1\n")
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        monkeypatch.setattr(cfg, "_is_vcpkg_working", lambda: False)
+        commands = cfg.generate(None)
+
+        assert any(cmd.startswith('rm -rf "vcpkg"') for cmd in commands)
+        assert any("git clone" in cmd for cmd in commands)
+        assert any("checkout 2024.01.12" in cmd for cmd in commands)
+        assert any("bootstrap-vcpkg" in cmd for cmd in commands)
         assert any("vcpkg" in cmd and "install" in cmd for cmd in commands)
 
     def test_generate_no_vcpkg_json(self, tmp_path, monkeypatch):

hatch_cpp/toolchains/common.py

@@ -101,6 +101,9 @@ class HatchCppLibrary(BaseModel, validate_assignment=True):
         return value
 
     def get_qualified_name(self, platform):
+        if self.binding == "cpython" and not self.py_limited_api:
+            suffix = get_config_var("EXT_SUFFIX")
+            return f"{self.name}{suffix}"
         if platform == "win32":
             suffix = "dll" if self.binding == "generic" else "pyd"
         elif platform == "darwin":

hatch_cpp/toolchains/vcpkg.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import configparser
+import subprocess
 from pathlib import Path
 from platform import machine as platform_machine
 from sys import platform as sys_platform
@@ -78,6 +79,39 @@ class HatchCppVcpkgConfiguration(BaseModel):
             return self.vcpkg_ref
         return _read_vcpkg_ref_from_gitmodules(self.vcpkg_root)
 
+    def _bootstrap_script_path(self) -> Path:
+        return self.vcpkg_root / ("bootstrap-vcpkg.bat" if sys_platform == "win32" else "bootstrap-vcpkg.sh")
+
+    def _vcpkg_executable_path(self) -> Path:
+        if sys_platform == "win32":
+            return self.vcpkg_root / "vcpkg.exe"
+        return self.vcpkg_root / "vcpkg"
+
+    def _delete_dir_command(self, path: Path) -> str:
+        if sys_platform == "win32":
+            return f'rmdir /s /q "{path}"'
+        return f'rm -rf "{path}"'
+
+    def _is_vcpkg_working(self) -> bool:
+        vcpkg_executable = self._vcpkg_executable_path()
+        if not vcpkg_executable.exists():
+            return False
+        try:
+            result = subprocess.run([str(vcpkg_executable), "version"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=False)
+            return result.returncode == 0
+        except OSError:
+            return False
+
+    def _clone_checkout_bootstrap_commands(self) -> list[str]:
+        commands = [f"git clone {self.vcpkg_repo} {self.vcpkg_root}"]
+
+        ref = self._resolve_vcpkg_ref()
+        if ref is not None:
+            commands.append(f"git -C {self.vcpkg_root} checkout {ref}")
+
+        commands.append(f"./{self._bootstrap_script_path()}")
+        return commands
+
     def generate(self, config):
         commands = []
 
@@ -87,14 +121,24 @@ class HatchCppVcpkgConfiguration(BaseModel):
                 raise ValueError(f"Could not determine vcpkg triplet for platform {sys_platform} and architecture {platform_machine()}")
 
         if self.vcpkg and Path(self.vcpkg).exists():
-            if not Path(self.vcpkg_root).exists():
-                commands.append(f"git clone {self.vcpkg_repo} {self.vcpkg_root}")
-
-                ref = self._resolve_vcpkg_ref()
-                if ref is not None:
-                    commands.append(f"git -C {self.vcpkg_root} checkout {ref}")
+            vcpkg_root = Path(self.vcpkg_root)
+            bootstrap_script = self._bootstrap_script_path()
+
+            if not vcpkg_root.exists():
+                commands.extend(self._clone_checkout_bootstrap_commands())
+            else:
+                is_empty_dir = vcpkg_root.is_dir() and not any(vcpkg_root.iterdir())
+                if is_empty_dir:
+                    commands.append(self._delete_dir_command(vcpkg_root))
+                    commands.extend(self._clone_checkout_bootstrap_commands())
+                else:
+                    vcpkg_executable = self._vcpkg_executable_path()
+                    if not vcpkg_executable.exists():
+                        commands.append(f"./{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 / 'bootstrap-vcpkg.sh' if sys_platform != 'win32' else self.vcpkg_root / 'bootstrap-vcpkg.bat'}")
             commands.append(f"./{self.vcpkg_root / 'vcpkg'} install --triplet {self.vcpkg_triplet}")
 
         return commands

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.3.6
+Version: 0.4.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
@@ -33,7 +33,7 @@ Requires-Dist: hatch-build>=0.3.2; extra == 'develop'
 Requires-Dist: hatchling; extra == 'develop'
 Requires-Dist: mdformat; extra == 'develop'
 Requires-Dist: mdformat-tables>=1; extra == 'develop'
-Requires-Dist: nanobind<2.13.0; extra == 'develop'
+Requires-Dist: nanobind; extra == 'develop'
 Requires-Dist: pybind11; extra == 'develop'
 Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'

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

@@ -1,25 +1,25 @@
-hatch_cpp/__init__.py,sha256=xGDCEwGyCK-WHRtDPw6Bgp1xGbgIgA5VB0RayrIeETs,114
+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/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=vs-kHdiHM7pCqM3oGQsSryq5blRi0HyK5QFfHxlJDi8,1773
+hatch_cpp/tests/test_projects.py,sha256=v05hZI9kfBCU6CpWXixyetNy92nC4Dajtxyj03lLjkQ,2168
 hatch_cpp/tests/test_structs.py,sha256=zmNtAV1bojvJM6gatjDtvqrAeUpKzpfmLrzgFTZLo8U,12028
-hatch_cpp/tests/test_vcpkg_ref.py,sha256=OEb4u3Ny-OYNYLanjGaG7-dL4WW48EYdbsxeDN0sqwM,7371
+hatch_cpp/tests/test_vcpkg_ref.py,sha256=wcfbFp8Tc6E2hiQPlextdno0NYrA1yljRSRUIQEj0mM,9969
 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=J6ijT9x9uSuisNEVIdFVgc_AstU9hbmIUbwvdjn_4GU,2795
+hatch_cpp/tests/test_project_cmake/CMakeLists.txt,sha256=OvJT0L18qH6zRm3Uw8pO6085WLY1HMvBgq6zIcFuQvU,2580
 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=J6ijT9x9uSuisNEVIdFVgc_AstU9hbmIUbwvdjn_4GU,2795
+hatch_cpp/tests/test_project_cmake_vcpkg/CMakeLists.txt,sha256=OvJT0L18qH6zRm3Uw8pO6085WLY1HMvBgq6zIcFuQvU,2580
 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
@@ -58,10 +58,10 @@ hatch_cpp/tests/test_project_pybind_vcpkg/cpp/project/basic.hpp,sha256=LZSfCfhLY
 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=wOu1d9bOWW962NH-Bt-cXLlfAjgCbLgq-lIXxSupCvc,20265
-hatch_cpp/toolchains/vcpkg.py,sha256=ku5NE4ihdzbxdReNUXsGx03fPG5FYdQC48mJhdpW-oo,3456
-hatch_cpp-0.3.6.dist-info/METADATA,sha256=lyNg7Xk0tL_pqvKFnNujLuxdC8_8tV1WiLvazo63ywQ,9896
-hatch_cpp-0.3.6.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-hatch_cpp-0.3.6.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
-hatch_cpp-0.3.6.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
-hatch_cpp-0.3.6.dist-info/RECORD,,
+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-0.3.6.dist-info → hatch_cpp-0.4.0.dist-info}/WHEEL

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