Remove Preset Writes

Author: Behemyth

cppython/plugins/cmake/builder.py

@@ -33,51 +33,14 @@ def generate_cppython_preset(
         """
         configure_presets = []
 
-        preset_name = 'cppython-default'
-        parent_preset_name = f'{provider_data.provider_name}-default'
+        preset_name = 'cppython'
 
         # Create a default preset that inherits from provider's default preset
-        default_configure = ConfigurePreset(name=preset_name, inherits=parent_preset_name, hidden=True)
+        default_configure = ConfigurePreset(name=preset_name, hidden=True, toolchainFile=provider_data.toolchain_file)
         configure_presets.append(default_configure)
 
-        # Create presets for each configuration
-        for config in provider_data.configurations:
-            config_name = config.lower()
-            preset_name = f'cppython-{config_name}'
-            parent_preset_name = f'{provider_data.provider_name}-{config_name}'
-            preset = ConfigurePreset(name=preset_name, inherits=parent_preset_name, hidden=True)
-            configure_presets.append(preset)
-
-        build_presets = []
-
-        # Multi-config build presets using the default configure preset.
-        # Important: Do not use a configure preset here, the user will do that in their own presets.
-        for config in provider_data.configurations:
-            config_name = config.lower()
-            preset_name = f'cppython-multi-{config_name}'
-            parent_preset_name = f'{provider_data.provider_name}-multi-{config_name}'
-            multi_build_preset = BuildPreset(
-                name=preset_name,
-                configuration=config,
-                inherits=parent_preset_name,
-            )
-            build_presets.append(multi_build_preset)
-
-        # Single-config build presets using the config-specific configure presets
-        # Important: Do not use a configure preset here, the user will do that in their own presets.
-        for config in provider_data.configurations:
-            config_name = config.lower()
-            parent_config_name = f'{provider_data.provider_name}-{config_name}'
-            single_build_preset = BuildPreset(
-                name=config_name,
-                configuration=config,
-                inherits=parent_config_name,
-            )
-            build_presets.append(single_build_preset)
-
         generated_preset = CMakePresets(
             configurePresets=configure_presets,
-            buildPresets=build_presets,
         )
 
         # Get the relative path to the provider preset file

cppython/plugins/cmake/schema.py

@@ -99,7 +99,7 @@ class CMakePresets(CPPythonModel, extra='allow'):
 class CMakeSyncData(SyncData):
     """The CMake sync data"""
 
-    toolchain: Path | None = None
+    toolchain_file: Path | None = None
 
 
 class CMakeData(CPPythonModel):

cppython/plugins/conan/plugin.py

@@ -219,7 +219,7 @@ def _create_cmake_sync_data(self) -> CMakeSyncData:
 
         return CMakeSyncData(
             provider_name=TypeName('conan'),
-            toolchain=conan_toolchain_path,
+            toolchain_file=conan_toolchain_path,
         )
 
     @classmethod

tests/unit/plugins/cmake/test_presets.py

@@ -1,7 +1,6 @@
 """Tests for CMakePresets"""
 
 import json
-from pathlib import Path
 
 from cppython.core.schema import ProjectData
 from cppython.plugins.cmake.builder import Builder
@@ -54,58 +53,6 @@ def test_generate_root_preset_existing(project_data: ProjectData) -> None:
 class TestWrites:
     """Tests for writing the CMakePresets class"""
 
-    @staticmethod
-    def test_cppython_write(tmp_path: Path) -> None:
-        """Verifies that the cppython preset writing works as intended
-
-        Args:
-            tmp_path: The input path the use
-        """
-        builder = Builder()
-
-        # Create a mock provider preset file
-        provider_preset_file = tmp_path / 'provider.json'
-        provider_preset = {
-            'version': 9,
-            'configurePresets': [
-                {'name': 'test-provider-base', 'hidden': True},
-                {'name': 'test-provider-release', 'hidden': True, 'inherits': 'test-provider-base'},
-                {'name': 'test-provider-debug', 'hidden': True, 'inherits': 'test-provider-base'},
-            ],
-            'buildPresets': [
-                {
-                    'name': 'test-provider-multi-release',
-                    'configurePreset': 'test-provider-base',
-                    'configuration': 'Release',
-                    'hidden': True,
-                },
-                {
-                    'name': 'test-provider-multi-debug',
-                    'configurePreset': 'test-provider-base',
-                    'configuration': 'Debug',
-                    'hidden': True,
-                },
-                {
-                    'name': 'test-provider-release',
-                    'configurePreset': 'test-provider-release',
-                    'configuration': 'Release',
-                    'hidden': True,
-                },
-                {
-                    'name': 'test-provider-debug',
-                    'configurePreset': 'test-provider-debug',
-                    'configuration': 'Debug',
-                    'hidden': True,
-                },
-            ],
-        }
-
-        with provider_preset_file.open('w', encoding='utf-8') as file:
-            json.dump(provider_preset, file, indent=4)
-
-        data = CMakeSyncData(provider_name=TypeName('test-provider'), preset_file=provider_preset_file)
-        builder.write_cppython_preset(tmp_path, provider_preset_file, data)
-
     @staticmethod
     def test_root_write(project_data: ProjectData) -> None:
         """Verifies that the root preset writing works as intended
@@ -138,7 +85,7 @@ def test_root_write(project_data: ProjectData) -> None:
         with provider_preset_file.open('w') as f:
             json.dump(provider_preset_data, f)
 
-        data = CMakeSyncData(provider_name=TypeName('test-provider'), preset_file=provider_preset_file)
+        data = CMakeSyncData(provider_name=TypeName('test-provider'))
 
         cppython_preset_file = builder.write_cppython_preset(cppython_preset_directory, provider_preset_file, data)
 
@@ -184,7 +131,7 @@ def test_relative_root_write(project_data: ProjectData) -> None:
         with provider_preset_file.open('w') as f:
             json.dump(provider_preset_data, f)
 
-        data = CMakeSyncData(provider_name=TypeName('test-provider'), preset_file=provider_preset_file)
+        data = CMakeSyncData(provider_name=TypeName('test-provider'))
 
         cppython_preset_file = builder.write_cppython_preset(cppython_preset_directory, provider_preset_file, data)