Merge branch 'python-project-templates:main' into tkp/integ

Author: timkpaine

.copier-answers.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: b74d698
+_commit: 4d4d95a
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python

.github/workflows/build.yaml

@@ -55,7 +55,7 @@ jobs:
       run: make coverage
 
     - name: Upload test results (Python)
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
         path: junit.xml
@@ -73,7 +73,7 @@ jobs:
     - name: Make dist
       run: make dist
 
-    - uses: actions/upload-artifact@v6
+    - uses: actions/upload-artifact@v7
       with:
         name: dist-${{matrix.os}}
         path: dist

.gitignore

@@ -141,14 +141,12 @@ js/node_modules
 js/test-results
 js/playwright-report
 js/*.tgz
-hatch_cpp/extension
 
 # Jupyter
 .ipynb_checkpoints
 .autoversion
 Untitled*.ipynb
-!hatch_cpp/extension/hatch_cpp.json
-!hatch_cpp/extension/install.json
+hatch_cpp/extension
 hatch_cpp/nbextension
 hatch_cpp/labextension
 
@@ -158,5 +156,9 @@ hatch_cpp/labextension
 # Rust
 target
 
+# Hydra
+outputs/
+multirun/
+
 vcpkg
-vcpkg_installed
+vcpkg_installed

Makefile

@@ -46,12 +46,15 @@ format: fix
 ################
 # Other Checks #
 ################
-.PHONY: check-manifest checks check
+.PHONY: check-dist check-types checks check
 
-check-manifest:  ## check python sdist manifest with check-manifest
-	check-manifest -v
+check-dist:  ## check python sdist and wheel with check-dist
+	check-dist -v
 
-checks: check-manifest
+check-types:  ## check python types with ty
+	ty check --python $$(which python)
+
+checks: check-dist
 
 # Alias
 check: checks

hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.2"
+__version__ = "0.3.5"
 
 from .config import *
 from .hooks import *

hatch_cpp/config.py

@@ -108,7 +108,9 @@ def generate(self):
 
     def execute(self):
         for command in self.commands:
-            system_call(command)
+            ret = system_call(command)
+            if ret != 0:
+                raise RuntimeError(f"hatch-cpp build command failed with exit code {ret}: {command}")
         return self.commands
 
     def cleanup(self):

hatch_cpp/tests/test_vcpkg_ref.py

@@ -0,0 +1,174 @@
+"""Tests for vcpkg ref/branch checkout support."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from hatch_cpp.toolchains.vcpkg import (
+    HatchCppVcpkgConfiguration,
+    _read_vcpkg_ref_from_gitmodules,
+)
+
+
+class TestReadVcpkgRefFromGitmodules:
+    """Tests for the _read_vcpkg_ref_from_gitmodules helper."""
+
+    def test_no_gitmodules_file(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) is None
+
+    def test_gitmodules_without_vcpkg_submodule(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text('[submodule "other"]\n\tpath = other\n\turl = https://github.com/example/other.git\n')
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) is None
+
+    def test_gitmodules_vcpkg_without_branch(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text('[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n')
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) is None
+
+    def test_gitmodules_vcpkg_with_branch(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = 2024.01.12\n'
+        )
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) == "2024.01.12"
+
+    def test_gitmodules_vcpkg_with_commit_sha_branch(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        sha = "a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2"
+        (tmp_path / ".gitmodules").write_text(
+            f'[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = {sha}\n'
+        )
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) == sha
+
+    def test_gitmodules_custom_vcpkg_root(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "deps/vcpkg"]\n\tpath = deps/vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = 2024.06.15\n'
+        )
+        # Default vcpkg root won't match
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) is None
+        # Custom root matches
+        assert _read_vcpkg_ref_from_gitmodules(Path("deps/vcpkg")) == "2024.06.15"
+
+    def test_gitmodules_multiple_submodules(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "other"]\n'
+            "\tpath = other\n"
+            "\turl = https://github.com/example/other.git\n"
+            "\tbranch = main\n"
+            '[submodule "vcpkg"]\n'
+            "\tpath = vcpkg\n"
+            "\turl = https://github.com/microsoft/vcpkg.git\n"
+            "\tbranch = 2024.01.12\n"
+        )
+        assert _read_vcpkg_ref_from_gitmodules(Path("vcpkg")) == "2024.01.12"
+
+
+class TestVcpkgRefConfig:
+    """Tests for vcpkg_ref configuration field."""
+
+    def test_default_vcpkg_ref_is_none(self):
+        cfg = HatchCppVcpkgConfiguration()
+        assert cfg.vcpkg_ref is None
+
+    def test_explicit_vcpkg_ref(self):
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        assert cfg.vcpkg_ref == "2024.01.12"
+
+    def test_explicit_vcpkg_ref_commit_sha(self):
+        sha = "a1b2c3d4e5f6"
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref=sha)
+        assert cfg.vcpkg_ref == sha
+
+
+class TestResolveVcpkgRef:
+    """Tests for _resolve_vcpkg_ref priority logic."""
+
+    def test_explicit_ref_takes_priority_over_gitmodules(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = 2024.01.12\n'
+        )
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="my-custom-tag")
+        assert cfg._resolve_vcpkg_ref() == "my-custom-tag"
+
+    def test_falls_back_to_gitmodules(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = 2024.01.12\n'
+        )
+        cfg = HatchCppVcpkgConfiguration()
+        assert cfg._resolve_vcpkg_ref() == "2024.01.12"
+
+    def test_returns_none_when_no_ref(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        cfg = HatchCppVcpkgConfiguration()
+        assert cfg._resolve_vcpkg_ref() is None
+
+
+class TestVcpkgGenerate:
+    """Tests that generate() includes the checkout command when a ref is set."""
+
+    def _make_vcpkg_env(self, tmp_path):
+        """Create a minimal vcpkg.json so generate() produces commands."""
+        (tmp_path / "vcpkg.json").write_text("{}")
+
+    def test_generate_with_explicit_ref(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        commands = cfg.generate(None)
+
+        assert any("git clone" in cmd for cmd in commands)
+        assert any("git -C vcpkg checkout 2024.01.12" in cmd for cmd in commands)
+        # checkout must come after clone but before bootstrap
+        clone_idx = next(i for i, c in enumerate(commands) if "git clone" in c)
+        checkout_idx = next(i for i, c in enumerate(commands) if "checkout" in c)
+        bootstrap_idx = next(i for i, c in enumerate(commands) if "bootstrap" in c)
+        assert clone_idx < checkout_idx < bootstrap_idx
+
+    def test_generate_with_gitmodules_ref(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+        (tmp_path / ".gitmodules").write_text(
+            '[submodule "vcpkg"]\n\tpath = vcpkg\n\turl = https://github.com/microsoft/vcpkg.git\n\tbranch = 2024.06.15\n'
+        )
+
+        cfg = HatchCppVcpkgConfiguration()
+        commands = cfg.generate(None)
+
+        assert any("git -C vcpkg checkout 2024.06.15" in cmd for cmd in commands)
+
+    def test_generate_without_ref(self, tmp_path, monkeypatch):
+        monkeypatch.chdir(tmp_path)
+        self._make_vcpkg_env(tmp_path)
+
+        cfg = HatchCppVcpkgConfiguration()
+        commands = cfg.generate(None)
+
+        assert not any("checkout" in cmd for cmd in commands)
+        assert any("git clone" in cmd for cmd 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)
+        (tmp_path / "vcpkg").mkdir()
+
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        commands = cfg.generate(None)
+
+        # When vcpkg_root already exists, no clone or checkout happens
+        assert not any("git clone" in cmd for cmd in commands)
+        assert not any("checkout" 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):
+        monkeypatch.chdir(tmp_path)
+        # No vcpkg.json => no commands at all
+        cfg = HatchCppVcpkgConfiguration(vcpkg_ref="2024.01.12")
+        commands = cfg.generate(None)
+        assert commands == []

hatch_cpp/toolchains/common.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from re import match
 from shutil import which
-from sys import executable, platform as sys_platform
+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
 
@@ -346,7 +346,9 @@ def get_compile_flags(self, library: HatchCppLibrary, build_type: BuildType = "r
             flags += " " + " ".join(f"/U{macro}" for macro in effective_undef_macros)
             flags += " /EHsc /DWIN32"
             if library.std:
-                flags += f" /std:{library.std}"
+                # MSVC minimum is c++14; clamp older standards
+                std = library.std if library.std not in ("c++11", "c++0x") else "c++14"
+                flags += f" /std:{std}"
         # clean
         while flags.count("  "):
             flags = flags.replace("  ", " ")
@@ -395,10 +397,14 @@ def get_link_flags(self, library: HatchCppLibrary, build_type: BuildType = "rele
             flags += f" /Fe:{library.get_qualified_name(self.platform)}"
             flags += " /link /DLL"
             # Add Python libs directory - check multiple possible locations
+            # In virtual environments, sys.executable is in the venv, but pythonXX.lib
+            # lives under the base Python installation's 'libs' directory.
             python_libs_paths = [
                 Path(executable).parent / "libs",  # Standard Python install
                 Path(executable).parent.parent / "libs",  # Some virtualenv layouts
                 Path(get_config_var("installed_base") or "") / "libs",  # sysconfig approach
+                Path(exec_prefix) / "libs",  # exec_prefix approach
+                Path(base_exec_prefix) / "libs",  # base_exec_prefix approach
             ]
             for libs_path in python_libs_paths:
                 if libs_path.exists():

hatch_cpp/toolchains/vcpkg.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import configparser
 from pathlib import Path
 from platform import machine as platform_machine
 from sys import platform as sys_platform
@@ -38,14 +39,45 @@
 }
 
 
+def _read_vcpkg_ref_from_gitmodules(vcpkg_root: Path) -> Optional[str]:
+    """Read the branch/ref for vcpkg from .gitmodules if it exists.
+
+    Looks for a submodule whose path matches ``vcpkg_root`` and returns
+    its ``branch`` value when present.
+    """
+    gitmodules_path = Path(".gitmodules")
+    if not gitmodules_path.exists():
+        return None
+
+    parser = configparser.ConfigParser()
+    parser.read(str(gitmodules_path))
+
+    for section in parser.sections():
+        if parser.get(section, "path", fallback=None) == str(vcpkg_root):
+            return parser.get(section, "branch", fallback=None)
+
+    return None
+
+
 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(
+        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.",
+    )
 
     # TODO: overlay
 
+    def _resolve_vcpkg_ref(self) -> Optional[str]:
+        """Return the ref to checkout: explicit config takes priority, then .gitmodules."""
+        if self.vcpkg_ref is not None:
+            return self.vcpkg_ref
+        return _read_vcpkg_ref_from_gitmodules(self.vcpkg_root)
+
     def generate(self, config):
         commands = []
 
@@ -57,9 +89,12 @@ def generate(self, config):
         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}")
-                commands.append(
-                    f"./{self.vcpkg_root / 'bootstrap-vcpkg.sh' if sys_platform != 'win32' else self.vcpkg_root / 'sbootstrap-vcpkg.bat'}"
-                )
+
+                ref = self._resolve_vcpkg_ref()
+                if ref is not None:
+                    commands.append(f"git -C {self.vcpkg_root} checkout {ref}")
+
+                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