hatch-cpp 0.6.0__tar.gz → 0.6.1__tar.gz

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hatch-cpp
-Version: 0.6.0
+Version: 0.6.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

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 
 from .config import *
 from .hooks import *

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/config.py

@@ -197,8 +197,8 @@ class HatchCppBuildPlan(HatchCppBuildConfig):
                 if self.platform.platform == "emscripten":
                     objects = []
                     for source_index, source in enumerate(library.sources):
-                        obj = Path("build/hatch-cpp") / f"{library_index}-{source_index}-{Path(source).stem}.o"
-                        objects.append(str(obj))
+                        obj = f"build/hatch-cpp/{library_index}-{source_index}-{Path(source).stem}.o"
+                        objects.append(obj)
                         self.commands.append(f"{compiler} -c {source} {compile_flags} -o {obj}")
                     self.commands.append(f"{compiler} {' '.join(objects)} {link_flags}")
                 else:

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/tests/test_projects.py

@@ -15,7 +15,12 @@ class TestProject:
         [
             "test_project_basic",
             "test_project_override_classes",
-            "test_project_override_toolchain",
+            pytest.param(
+                "test_project_override_toolchain",
+                marks=pytest.mark.skipif(
+                    platform == "win32", reason="the fixture selects the gcc toolchain, whose flags clang rejects for MSVC targets"
+                ),
+            ),
             "test_project_pybind",
             "test_project_pybind_vcpkg",
             "test_project_nanobind",

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/tests/test_vcpkg_ref.py

@@ -125,6 +125,11 @@ class TestVcpkgGenerate:
         """Create a minimal vcpkg.json so generate() produces commands."""
         (tmp_path / "vcpkg.json").write_text("{}")
 
+    def _pin_linux_host(self, monkeypatch):
+        """Make generate() behave as on an x86_64 Linux host, whatever host runs the test."""
+        monkeypatch.setattr("hatch_cpp.toolchains.vcpkg.sys_platform", "linux")
+        monkeypatch.setattr("hatch_cpp.toolchains.vcpkg.platform_machine", lambda: "x86_64")
+
     def test_generate_with_explicit_ref(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
         self._make_vcpkg_env(tmp_path)
@@ -164,6 +169,7 @@ class TestVcpkgGenerate:
 
     def test_generate_uses_posix_command_paths(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
+        self._pin_linux_host(monkeypatch)
         self._make_vcpkg_env(tmp_path)
 
         cfg = HatchCppVcpkgConfiguration(vcpkg_triplet="x64-linux")
@@ -185,6 +191,7 @@ class TestVcpkgGenerate:
 
     def test_generate_detects_emscripten_triplet(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
+        self._pin_linux_host(monkeypatch)
         self._make_vcpkg_env(tmp_path)
         build_plan = SimpleNamespace(platform=SimpleNamespace(platform="emscripten"))
 
@@ -206,6 +213,7 @@ class TestVcpkgGenerate:
 
     def test_generate_skips_clone_when_vcpkg_root_exists(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
+        self._pin_linux_host(monkeypatch)
         self._make_vcpkg_env(tmp_path)
         vcpkg_root = tmp_path / "vcpkg"
         vcpkg_root.mkdir()
@@ -225,6 +233,7 @@ class TestVcpkgGenerate:
 
     def test_generate_reclones_when_vcpkg_root_exists_but_empty(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
+        self._pin_linux_host(monkeypatch)
         self._make_vcpkg_env(tmp_path)
         (tmp_path / "vcpkg").mkdir()
 
@@ -253,6 +262,7 @@ class TestVcpkgGenerate:
 
     def test_generate_reclones_when_vcpkg_exists_but_not_working(self, tmp_path, monkeypatch):
         monkeypatch.chdir(tmp_path)
+        self._pin_linux_host(monkeypatch)
         self._make_vcpkg_env(tmp_path)
         vcpkg_root = tmp_path / "vcpkg"
         vcpkg_root.mkdir()

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/toolchains/cmake.py

@@ -10,16 +10,6 @@ from .common import Platform
 
 __all__ = ("HatchCppCmakeConfiguration",)
 
-DefaultMSVCGenerator = {
-    "12": "Visual Studio 12 2013",
-    "14": "Visual Studio 14 2015",
-    "14.0": "Visual Studio 14 2015",
-    "14.1": "Visual Studio 15 2017",
-    "14.2": "Visual Studio 16 2019",
-    "14.3": "Visual Studio 17 2022",
-    "14.4": "Visual Studio 17 2022",
-}
-
 
 class HatchCppCmakeConfiguration(BaseModel):
     root: Path | None = None
@@ -54,13 +44,10 @@ class HatchCppCmakeConfiguration(BaseModel):
             commands[-1] += f" -DCMAKE_INSTALL_PREFIX={Path(self.root).parent}"
 
         # TODO: CMAKE_CXX_COMPILER
-        # Respect CMAKE_GENERATOR environment variable
+        # Respect CMAKE_GENERATOR environment variable. Without it CMake picks its default,
+        # which on Windows is the newest installed Visual Studio.
         cmake_generator = environ.get("CMAKE_GENERATOR", "")
-        if config.platform.platform == "win32":
-            if not cmake_generator:
-                cmake_generator = "Visual Studio 17 2022"
-            commands[-1] += f' -G "{cmake_generator}"'
-        elif cmake_generator:
+        if cmake_generator:
             commands[-1] += f' -G "{cmake_generator}"'
 
         # Put in CMake flags

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/hatch_cpp/toolchains/vcpkg.py

@@ -57,7 +57,7 @@ def _read_vcpkg_ref_from_gitmodules(vcpkg_root: Path) -> str | None:
     parser.read(str(gitmodules_path))
 
     for section in parser.sections():
-        if parser.get(section, "path", fallback=None) == str(vcpkg_root):
+        if parser.get(section, "path", fallback=None) == vcpkg_root.as_posix():
             return parser.get(section, "branch", fallback=None)
 
     return None
@@ -93,7 +93,7 @@ class HatchCppVcpkgConfiguration(BaseModel):
     def _command_path(self, path: Path) -> str:
         if sys_platform == "win32":
             return str(path).replace("/", "\\")
-        return f"./{path}"
+        return f"./{path.as_posix()}"
 
     def _delete_dir_command(self, path: Path) -> str:
         if sys_platform == "win32":

{hatch_cpp-0.6.0 → hatch_cpp-0.6.1}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 description = "Hatch plugin for C++ builds"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.6.0"
+version = "0.6.1"
 requires-python = ">=3.10"
 keywords = [
     "hatch",
@@ -81,7 +81,7 @@ Repository = "https://github.com/python-project-templates/hatch-cpp"
 Homepage = "https://github.com/python-project-templates/hatch-cpp"
 
 [tool.bumpversion]
-current_version = "0.6.0"
+current_version = "0.6.1"
 commit = true
 tag = true
 commit_args = "-s"