Merge pull request #137 from python-project-templates/copier-update-2026-10-11T11-26-26Z

Update from Copier (2026-10-11T11-26-26Z)

Author: timkpaine

.copier-answers.yaml

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

.github/workflows/build.yaml

@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 permissions:

Makefile

@@ -25,16 +25,16 @@ lint-py:  ## lint python with ruff
 	python -m ruff format --check hatch_cpp
 
 lint-docs:  ## lint docs with mdformat and codespell
-	python -m mdformat --check README.md 
-	python -m codespell_lib README.md 
+	python -m mdformat --check README.md $(wildcard docs/src)
+	python -m codespell_lib README.md $(wildcard docs/src)
 
 fix-py:  ## autoformat python code with ruff
 	python -m ruff check --fix hatch_cpp
 	python -m ruff format hatch_cpp
 
 fix-docs:  ## autoformat docs with mdformat and codespell
-	python -m mdformat README.md 
-	python -m codespell_lib --write README.md 
+	python -m mdformat README.md $(wildcard docs/src)
+	python -m codespell_lib --write README.md $(wildcard docs/src)
 
 lint: lint-py lint-docs  ## run all linters
 lints: lint
@@ -50,9 +50,9 @@ check-dist:  ## check python sdist and wheel with check-dist
 	check-dist -v
 
 check-types:  ## check python types with ty
-	ty check --python $$(which python)
+	python -m ty check
 
-checks: check-dist
+checks: check-dist check-types
 
 # Alias
 check: checks

hatch_cpp/config.py

@@ -25,7 +25,7 @@ class HatchCppBuildConfig(BaseModel):
     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)
+    platform: HatchCppPlatform = Field(default_factory=HatchCppPlatform.default)
     vcpkg: HatchCppVcpkgConfiguration | None = Field(default_factory=HatchCppVcpkgConfiguration)
 
     @model_validator(mode="wrap")
@@ -72,7 +72,7 @@ def generate(self):
                 self._active_toolchains.append("vcpkg")
             else:
                 log.warning("HATCH_CPP_VCPKG=1 set but no vcpkg configuration found; ignoring.")
-        elif vcpkg_override != "0" and self.vcpkg and Path(self.vcpkg.vcpkg).exists():
+        elif vcpkg_override != "0" and self.vcpkg and self.vcpkg.vcpkg and Path(self.vcpkg.vcpkg).exists():
             self._active_toolchains.append("vcpkg")
 
         if self.libraries:
@@ -87,6 +87,7 @@ def generate(self):
 
         # Collect toolchain commands
         if "vcpkg" in self._active_toolchains:
+            assert self.vcpkg is not None
             self.commands.extend(self.vcpkg.generate(self))
 
         if "vanilla" in self._active_toolchains:
@@ -108,6 +109,7 @@ def generate(self):
                     self.commands.append(f"{compiler} {' '.join(library.sources)} {compile_flags} {link_flags}")
 
         if "cmake" in self._active_toolchains:
+            assert self.cmake is not None
             self.commands.extend(self.cmake.generate(self))
 
         return self.commands

hatch_cpp/plugin.py

@@ -104,6 +104,7 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
                 all(lib.py_limited_api for lib in build_plan.libraries),
             )
         else:
+            assert build_plan.cmake is not None
             build_data["pure_python"] = False
             machine = platform_machine()
             version_major = version_info.major

hatch_cpp/tests/test_hatch_build.py

@@ -1,3 +1,4 @@
+from importlib import import_module
 from os import listdir
 from pathlib import Path
 from shutil import rmtree
@@ -41,6 +42,6 @@ def test_hatch_build(self):
         # import
         here = Path(__file__).parent / project
         path.insert(0, str(here))
-        import project.extension
+        extension = import_module("project.extension")
 
-        assert project.extension.hello() == "A string"
+        assert extension.hello() == "A string"

hatch_cpp/tests/test_hook_registration.py

@@ -1,4 +1,5 @@
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+from hatchling.metadata.core import ProjectMetadata
 
 from hatch_cpp.hooks import hatch_register_build_hook
 
@@ -10,7 +11,7 @@ def test_registered_build_hook_accepts_hatchling_configuration(tmp_path):
         root=str(tmp_path),
         config=config,
         build_config=None,
-        metadata=None,
+        metadata=ProjectMetadata(str(tmp_path), None, {"project": {"name": "project", "version": "0.1.0"}}),
         directory=str(tmp_path),
         target_name="wheel",
     )

hatch_cpp/tests/test_project_pyodide/pyodide_project/extension.pyi

@@ -0,0 +1 @@
+def answer() -> int: ...

hatch_cpp/tests/test_projects.py

@@ -1,4 +1,5 @@
 import contextlib
+from importlib import import_module
 from os import listdir, remove
 from pathlib import Path
 from subprocess import check_call
@@ -60,6 +61,6 @@ def test_basic(self, project):
         # import
         here = Path(__file__).parent / project
         path.insert(0, str(here))
-        import project.extension
+        extension = import_module("project.extension")
 
-        assert project.extension.hello() == "A string"
+        assert extension.hello() == "A string"

hatch_cpp/toolchains/cmake.py

@@ -3,7 +3,6 @@
 from os import environ
 from pathlib import Path
 from sys import version_info
-from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -33,7 +32,8 @@ class HatchCppCmakeConfiguration(BaseModel):
 
     include_flags: dict[str, str | int | float | bool] | None = Field(default=None)
 
-    def generate(self, config) -> dict[str, Any]:
+    def generate(self, config) -> list[str]:
+        assert self.root is not None
         commands = []
 
         # Derive prefix