CMake Variants

Author: Behemyth

.gitignore

@@ -25,5 +25,4 @@ __pypackages__/
 !.vscode/launch.json
 !.vscode/extensions.json
 /.mypy_cache
-node_modules/
-build/
+node_modules/

cppython/plugins/cmake/schema.py

@@ -66,7 +66,7 @@ class CMakeConfiguration(CPPythonModel):
     """Configuration"""
 
     preset_file: Annotated[
-        FilePath,
+        Path,
         Field(
             description="The CMakePreset.json file that will be searched for the given 'configuration_name'",
         ),

cppython/test/schema.py

@@ -1,8 +1,9 @@
 """Data schemas for plugin testing"""
 
+from pathlib import Path
 from typing import Annotated
 
-from pydantic import DirectoryPath, Field
+from pydantic import Field
 
 from cppython.core.schema import CPPythonModel
 
@@ -12,7 +13,7 @@ class Variant[T: CPPythonModel](CPPythonModel):
 
     configuration: Annotated[T, Field(description='The configuration data')]
     directory: Annotated[
-        DirectoryPath | None,
+        Path | None,
         Field(description='The directory to mount alongside the configuration. `tests/build/<directory>`'),
     ] = None
 

tests/build/cmake/non-root/inner/CMakePresets.json

@@ -1,34 +1,42 @@
 """Fixtures for the cmake plugin"""
 
+from pathlib import Path
 from typing import cast
 
 import pytest
 
 from cppython.plugins.cmake.schema import CMakeConfiguration
+from cppython.test.schema import Variant, Variants
 
 
-def _cmake_data_list() -> list[CMakeConfiguration]:
+def _cmake_data_list() -> Variants[CMakeConfiguration]:
     """Creates a list of mocked configuration types
 
     Returns:
         A list of variants to test
     """
-    variants = []
+    data = Variants[CMakeConfiguration]()
 
     # Default
-    variants.append(CMakeConfiguration(configuration_name='default'))
+    default = CMakeConfiguration(configuration_name='default')
+    default_variant = Variant[CMakeConfiguration](configuration=default)
 
-    # variants.append(CMakeConfiguration(preset_file=Path("inner/CMakePresets.json"), configuration_name="default"))
+    # Non-root preset file
+    config = CMakeConfiguration(preset_file=Path('inner/CMakePresets.json'), configuration_name='default')
+    config_variant = Variant[CMakeConfiguration](configuration=config, directory=Path('cmake/non-root'))
 
-    return variants
+    data.variants.append(default_variant)
+    data.variants.append(config_variant)
+
+    return data
 
 
 @pytest.fixture(
     name='cmake_data',
     scope='session',
     params=_cmake_data_list(),
 )
-def fixture_cmake_data(request: pytest.FixtureRequest) -> CMakeConfiguration:
+def fixture_cmake_data(request: pytest.FixtureRequest) -> Variant[CMakeConfiguration]:
     """A fixture to provide a list of configuration types
 
     Args:
@@ -37,4 +45,4 @@ def fixture_cmake_data(request: pytest.FixtureRequest) -> CMakeConfiguration:
     Returns:
         A configuration type instance
     """
-    return cast(CMakeConfiguration, request.param)
+    return cast(Variant[CMakeConfiguration], request.param)

tests/fixtures/cmake.py

@@ -7,6 +7,7 @@
 from cppython.plugins.cmake.plugin import CMakeGenerator
 from cppython.plugins.cmake.schema import CMakeConfiguration
 from cppython.test.pytest.tests import GeneratorIntegrationTests
+from cppython.test.schema import Variant
 
 pytest_plugins = ['tests.fixtures.cmake']
 
@@ -16,7 +17,7 @@ class TestCPPythonGenerator(GeneratorIntegrationTests[CMakeGenerator]):
 
     @staticmethod
     @pytest.fixture(name='plugin_data', scope='session')
-    def fixture_plugin_data(cmake_data: CMakeConfiguration) -> dict[str, Any]:
+    def fixture_plugin_data(cmake_data: Variant[CMakeConfiguration]) -> dict[str, Any]:
         """A required testing hook that allows data generation
 
         Args:
@@ -25,7 +26,7 @@ def fixture_plugin_data(cmake_data: CMakeConfiguration) -> dict[str, Any]:
         Returns:
             The constructed plugin data
         """
-        return cmake_data.model_dump()
+        return cmake_data.configuration.model_dump()
 
     @staticmethod
     @pytest.fixture(name='plugin_type', scope='session')

tests/integration/plugins/cmake/test_generator.py

@@ -14,6 +14,7 @@
     CMakeSyncData,
 )
 from cppython.test.pytest.tests import GeneratorUnitTests
+from cppython.test.schema import Variant
 from cppython.utility.utility import TypeName
 
 pytest_plugins = ['tests.fixtures.cmake']
@@ -24,7 +25,7 @@ class TestCPPythonGenerator(GeneratorUnitTests[CMakeGenerator]):
 
     @staticmethod
     @pytest.fixture(name='plugin_data', scope='session')
-    def fixture_plugin_data(cmake_data: CMakeConfiguration) -> dict[str, Any]:
+    def fixture_plugin_data(cmake_data: Variant[CMakeConfiguration]) -> dict[str, Any]:
         """A required testing hook that allows data generation
 
         Args:
@@ -33,7 +34,7 @@ def fixture_plugin_data(cmake_data: CMakeConfiguration) -> dict[str, Any]:
         Returns:
             The constructed plugin data
         """
-        return cmake_data.model_dump()
+        return cmake_data.configuration.model_dump()
 
     @staticmethod
     @pytest.fixture(name='plugin_type', scope='session')