Remove Conf

Author: Behemyth

cppython/plugins/conan/builder.py

@@ -1,7 +1,6 @@
 """Construction of Conan data"""
 
-import shutil
-from pathlib import Path, PurePosixPath
+from pathlib import Path
 
 from pydantic import DirectoryPath
 
@@ -20,15 +19,13 @@ def _create_base_conanfile(
         base_file: Path,
         dependencies: list[ConanDependency],
         dependency_groups: dict[str, list[ConanDependency]],
-        cmake_binary: Path | None = None,
     ) -> None:
         """Creates a conanfile_base.py with CPPython managed dependencies.
 
         Args:
             base_file: Path to write the base conanfile
             dependencies: List of main dependencies
             dependency_groups: Dictionary of dependency groups (e.g., 'test')
-            cmake_binary: Optional path to CMake binary to use
         """
         test_dependencies = dependency_groups.get('test', [])
 
@@ -46,16 +43,6 @@ def _create_base_conanfile(
             '\n'.join(test_requires_lines) if test_requires_lines else '        pass  # No test requirements'
         )
 
-        # Generate configure method content for cmake_program if specified
-        if cmake_binary:
-            # Use PurePosixPath for conan compatibility and space handling
-            cmake_path_str = f'"{PurePosixPath(cmake_binary.resolve())}"'
-            configure_content = f'''    def configure(self):
-        """CPPython managed configuration."""
-        self.conf.define("tools.cmake:cmake_program", {repr(cmake_path_str)})'''
-        else:
-            configure_content = ''
-
         content = f'''"""CPPython managed base ConanFile.
 
 This file is auto-generated by CPPython. Do not edit manually.
@@ -67,7 +54,6 @@ def _create_base_conanfile(
 
 class CPPythonBase(ConanFile):
     """Base ConanFile with CPPython managed dependencies."""
-{configure_content}
 
     def requirements(self):
         """CPPython managed requirements."""
@@ -164,25 +150,13 @@ def generate_conanfile(
 
         Args:
             directory: The project directory
-            data: Generation data containing dependencies, project info, and cmake binary path.
-                If cmake_binary is not provided, attempts to find cmake in the current
-                Python environment.
+            data: Generation data containing dependencies and project info.
         """
         directory.mkdir(parents=True, exist_ok=True)
 
-        # Resolve cmake binary path
-        resolved_cmake: Path | None = None
-        if data.cmake_binary and data.cmake_binary != 'cmake':
-            resolved_cmake = Path(data.cmake_binary).resolve()
-        else:
-            # Try to find cmake in the current Python environment (venv)
-            cmake_path = shutil.which('cmake')
-            if cmake_path:
-                resolved_cmake = Path(cmake_path).resolve()
-
         # Always regenerate the base conanfile with managed dependencies
         base_file = directory / 'conanfile_base.py'
-        self._create_base_conanfile(base_file, data.dependencies, data.dependency_groups, resolved_cmake)
+        self._create_base_conanfile(base_file, data.dependencies, data.dependency_groups)
 
         # Only create conanfile.py if it doesn't exist
         conan_file = directory / self._filename

cppython/plugins/conan/plugin.py

@@ -121,7 +121,6 @@ def _prepare_installation(self, groups: list[str] | None = None) -> Path:
             dependency_groups=resolved_dependency_groups,
             name=self.core_data.pep621_data.name,
             version=self.core_data.pep621_data.version,
-            cmake_binary=self._cmake_binary,
         )
 
         self.builder.generate_conanfile(

cppython/plugins/conan/schema.py

@@ -307,7 +307,6 @@ class ConanfileGenerationData(CPPythonModel):
     dependency_groups: dict[str, list[ConanDependency]]
     name: str
     version: str
-    cmake_binary: str | None = None
 
 
 class ConanConfiguration(CPPythonModel):

tests/unit/plugins/conan/test_builder.py

@@ -171,66 +171,3 @@ def test_inheritance_chain(self, builder: Builder, tmp_path: Path) -> None:
         assert 'class TestProjectPackage(CPPythonBase):' in user_content
         assert 'super().requirements()' in user_content
         assert 'super().build_requirements()' in user_content
-
-    def test_cmake_binary_configure(self, builder: Builder, tmp_path: Path) -> None:
-        """Test that cmake_binary generates configure() with forward slashes."""
-        base_file = tmp_path / 'conanfile_base.py'
-        cmake_path = Path('C:/Program Files/CMake/bin/cmake.exe')
-
-        builder._create_base_conanfile(base_file, [], {}, cmake_binary=cmake_path)
-
-        content = base_file.read_text(encoding='utf-8')
-        assert 'def configure(self):' in content
-        assert 'self.conf.define("tools.cmake:cmake_program"' in content
-        assert 'C:/Program Files/CMake/bin/cmake.exe' in content
-        assert '\\' not in content.split('tools.cmake:cmake_program')[1].split('"')[1]
-
-    def test_cmake_binary_path_with_spaces(self, builder: Builder, tmp_path: Path) -> None:
-        """Test that cmake_binary paths with spaces are quoted to prevent shell parsing errors."""
-        base_file = tmp_path / 'conanfile_base.py'
-        cmake_path = Path('C:/Program Files/CMake/bin/cmake.exe')
-
-        builder._create_base_conanfile(base_file, [], {}, cmake_binary=cmake_path)
-
-        content = base_file.read_text(encoding='utf-8')
-        # The path must be wrapped in quotes so Conan passes it as a single argument
-        assert '"C:/Program Files/CMake/bin/cmake.exe"' in content
-
-    def test_no_cmake_binary(self, builder: Builder, tmp_path: Path) -> None:
-        """Test that no cmake_binary means no configure() method."""
-        base_file = tmp_path / 'conanfile_base.py'
-
-        builder._create_base_conanfile(base_file, [], {}, cmake_binary=None)
-
-        content = base_file.read_text(encoding='utf-8')
-        assert 'def configure(self):' not in content
-
-    @pytest.mark.parametrize(
-        ('venv_cmake', 'expect_configure'),
-        [
-            ('/path/to/venv/bin/cmake', True),
-            (None, False),
-        ],
-    )
-    def test_cmake_binary_venv_fallback(
-        self,
-        builder: Builder,
-        tmp_path: Path,
-        monkeypatch: pytest.MonkeyPatch,
-        venv_cmake: str | None,
-        expect_configure: bool,
-    ) -> None:
-        """Test venv cmake fallback when cmake_binary is default."""
-        monkeypatch.setattr('cppython.plugins.conan.builder.shutil.which', lambda _: venv_cmake)
-
-        data = ConanfileGenerationData(
-            dependencies=[],
-            dependency_groups={},
-            name='test-project',
-            version='1.0.0',
-            cmake_binary='cmake',
-        )
-        builder.generate_conanfile(directory=tmp_path, data=data)
-
-        content = (tmp_path / 'conanfile_base.py').read_text(encoding='utf-8')
-        assert ('def configure(self):' in content) == expect_configure