Baseline

Author: Behemyth

cppython/core/schema.py

@@ -15,7 +15,7 @@
 class CPPythonModel(BaseModel):
     """The base model to use for all CPPython models"""
 
-    model_config = ConfigDict(validate_by_name=False, validate_by_alias=True, arbitrary_types_allowed=True)
+    model_config = ConfigDict(validate_by_name=True, validate_by_alias=True, arbitrary_types_allowed=True)
 
 
 class ProjectData(CPPythonModel, extra='forbid'):

cppython/plugins/vcpkg/resolution.py

@@ -1,5 +1,6 @@
 """Builder to help build vcpkg state"""
 
+from subprocess import CalledProcessError, check_output
 from typing import Any
 
 from packaging.requirements import Requirement
@@ -24,13 +25,21 @@ def generate_manifest(core_data: CorePluginData, data: VcpkgData) -> Manifest:
     Returns:
         The manifest
     """
-    manifest = {
-        'name': core_data.pep621_data.name,
-        'version_string': core_data.pep621_data.version,
-        'dependencies': data.dependencies,
-    }
-
-    return Manifest(**manifest)
+    # If builtin_baseline is None, we set it to the current commit of the cloned vcpkg repository
+    if data.builtin_baseline is None:
+        try:
+            # Get the current commit hash from the vcpkg repository
+            result = check_output(['git', 'rev-parse', 'HEAD'], cwd=str(core_data.project_data.project_root))
+            data.builtin_baseline = result.decode('utf-8').strip()
+        except (CalledProcessError, FileNotFoundError) as e:
+            raise ConfigException('Failed to get the current commit hash from the vcpkg repository.', []) from e
+
+    return Manifest(
+        name=core_data.pep621_data.name,
+        version_string=core_data.pep621_data.version,
+        dependencies=data.dependencies,
+        builtin_baseline=data.builtin_baseline,
+    )
 
 
 def resolve_vcpkg_data(data: dict[str, Any], core_data: CorePluginData) -> VcpkgData:
@@ -64,6 +73,7 @@ def resolve_vcpkg_data(data: dict[str, Any], core_data: CorePluginData) -> Vcpkg
     return VcpkgData(
         install_directory=modified_install_directory,
         dependencies=vcpkg_dependencies,
+        builtin_baseline=parsed_data.builtin_baseline,
     )
 
 
@@ -83,18 +93,18 @@ def resolve_vcpkg_dependency(requirement: Requirement) -> VcpkgDependency:
         raise ConfigException('Multiple specifiers are not supported. Please provide a single specifier.', [])
 
     # Extract the version from the single specifier
-    version = None
+    min_version = None
     if len(specifiers) == 1:
         specifier = next(iter(specifiers))
         if specifier.operator != '>=':
             raise ConfigException(f"Unsupported specifier '{specifier.operator}'. Only '>=' is supported.", [])
-        version = specifier.version
+        min_version = specifier.version
 
     return VcpkgDependency(
         name=requirement.name,
         default_features=True,
         features=[],
-        version=version,
+        version_ge=min_version,
         platform=None,
         host=False,
     )

cppython/plugins/vcpkg/schema.py

@@ -23,7 +23,7 @@ class VcpkgDependency(CPPythonModel):
         list[str],
         Field(description='A list of additional features to require for the dependency.'),
     ] = []
-    version: Annotated[
+    version_ge: Annotated[
         str | None,
         Field(
             alias='version>=',
@@ -45,6 +45,7 @@ class VcpkgData(CPPythonModel):
 
     install_directory: Path
     dependencies: list[VcpkgDependency]
+    builtin_baseline: str | None
 
 
 class VcpkgConfiguration(CPPythonModel):
@@ -58,14 +59,23 @@ class VcpkgConfiguration(CPPythonModel):
         ),
     ] = Path('build')
 
+    builtin_baseline: Annotated[
+        str | None,
+        Field(
+            alias='builtin-baseline',
+            description='A shortcut for specifying the baseline for version resolution in the default registry.',
+        ),
+    ] = None
+
 
 class Manifest(CPPythonModel):
     """The manifest schema"""
 
     name: Annotated[str, Field(description='The project name')]
 
-    version_string: Annotated[str, Field(alias='version-string', description='The arbitrary version string')] = ''
+    version_string: Annotated[str, Field(alias='version-string', description='The arbitrary version string')]
 
     description: Annotated[str, Field(description='The project description')] = ''
     homepage: Annotated[HttpUrl | None, Field(description='Homepage URL')] = None
     dependencies: Annotated[list[VcpkgDependency], Field(description='List of dependencies')] = []
+    builtin_baseline: Annotated[str, Field(alias='builtin-baseline', description='The arbitrary version string')]

tests/integration/examples/test_vcpkg_cmake.py

@@ -1,5 +1,7 @@
 """TODO"""
 
+import subprocess
+
 from typer.testing import CliRunner
 
 from cppython.console.entry import app
@@ -21,3 +23,21 @@ def test_simple(example_runner: CliRunner) -> None:
         )
 
         assert result.exit_code == 0, result.output
+
+        # Run the CMake configuration command
+        cmake_result = subprocess.run(['cmake', '--preset=default'], capture_output=True, text=True, check=False)
+
+        assert cmake_result.returncode == 0, f'CMake configuration failed: {cmake_result.stderr}'
+
+        # Run the CMake build command
+        build_result = subprocess.run(['cmake', '--build', 'build'], capture_output=True, text=True, check=False)
+
+        assert build_result.returncode == 0, f'CMake build failed: {build_result.stderr}'
+        assert 'Build finished successfully' in build_result.stdout, 'CMake build did not finish successfully'
+
+        # Execute the built program and verify the output
+        program_result = subprocess.run(['build/HelloWorld'], capture_output=True, text=True, check=False)
+
+        assert program_result.returncode == 0, f'Program execution failed: {program_result.stderr}'
+
+        assert 'Hello, World!' in program_result.stdout, 'Program output did not match expected output'

tests/unit/plugins/vcpkg/test_resolution.py

@@ -16,7 +16,7 @@ def test_resolve_vcpkg_dependency() -> None:
         dependency = resolve_vcpkg_dependency(requirement)
 
         assert dependency.name == 'example-package'
-        assert dependency.version == '1.2.3'
+        assert dependency.version_ge == '1.2.3'
         assert dependency.default_features is True
         assert dependency.features == []
         assert dependency.platform is None