hatch-cpp 0.3.6__tar.gz → 0.4.0__tar.gz

{hatch_cpp-0.3.6 → hatch_cpp-0.4.0}/.gitignore

@@ -5,12 +5,18 @@ __pycache__/
 
 # C extensions
 *.a
+*.o
+*.dSYM
 *.so
 *.obj
 *.dll
 *.exp
 *.lib
 
+# Rust
+target
+target-capi
+
 # Distribution / packaging
 .Python
 build/
@@ -55,26 +61,12 @@ junit.xml
 .hypothesis/
 .pytest_cache/
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
+# Django
 *.log
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
 
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# PyBuilder
-target/
-
 # IPython
 profile_default/
 ipython_config.py
@@ -85,15 +77,12 @@ ipython_config.py
 # pipenv
 Pipfile.lock
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
+# Celery
 celerybeat-schedule
 celerybeat.pid
 
-# SageMath parsed files
-*.sage.py
+# Airspeed Velocity
+.asv
 
 # Environments
 .env
@@ -126,11 +115,12 @@ dmypy.json
 /site
 index.md
 docs/_build/
-docs/src/_build/
 docs/api
-docs/index.md
 docs/html
+docs/index.md
 docs/jupyter_execute
+docs/src/_build/
+docs/superpowers
 index.md
 
 # JS
@@ -150,15 +140,21 @@ hatch_cpp/extension
 hatch_cpp/nbextension
 hatch_cpp/labextension
 
+# Emscripten SDK (locally installed)
+emsdk
+
 # Mac
 .DS_Store
 
-# Rust
-target
-
 # Hydra
-outputs/
-multirun/
+/outputs/
+/multirun/
+
+# AI
+ROADMAP.md
+AGENTS.md
+.github/hooks/sdlc.json
+.superpowers
 
 vcpkg
 vcpkg_installed

{hatch_cpp-0.3.6 → hatch_cpp-0.4.0}/PKG-INFO

@@ -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 → hatch_cpp-0.4.0}/hatch_cpp/__init__.py

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

{hatch_cpp-0.3.6/hatch_cpp/tests/test_project_cmake_vcpkg → hatch_cpp-0.4.0/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-0.3.6/hatch_cpp/tests/test_project_cmake → hatch_cpp-0.4.0/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-0.3.6 → hatch_cpp-0.4.0}/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-0.3.6 → hatch_cpp-0.4.0}/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-0.3.6 → hatch_cpp-0.4.0}/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-0.3.6 → hatch_cpp-0.4.0}/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 → hatch_cpp-0.4.0}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 description = "Hatch plugin for C++ builds"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.3.6"
+version = "0.4.0"
 requires-python = ">=3.10"
 keywords = [
     "hatch",
@@ -62,7 +62,7 @@ develop = [
     "uv",
     "wheel",
     # test
-    "nanobind<2.13.0",  # https://github.com/wjakob/nanobind/commit/abd27e3b5565bc95f5091321f0f863fce8b5b95b
+    "nanobind",
     "pybind11",
     "pytest",
     "pytest-cov",
@@ -80,7 +80,7 @@ Repository = "https://github.com/python-project-templates/hatch-cpp"
 Homepage = "https://github.com/python-project-templates/hatch-cpp"
 
 [tool.bumpversion]
-current_version = "0.3.6"
+current_version = "0.4.0"
 commit = true
 tag = true
 commit_args = "-s"
@@ -100,6 +100,8 @@ branch = false
 omit = [
     "hatch_cpp/tests/integration/",
 ]
+patch = ["subprocess"]
+
 
 [tool.coverage.report]
 exclude_also = [
@@ -132,6 +134,7 @@ addopts = [
     "--junitxml=junit.xml",
 ]
 testpaths = "hatch_cpp/tests"
+norecursedirs = "vcpkg"
 
 [tool.ruff]
 line-length = 150