Lint Fixes

Author: Behemyth

cppython/core/resolution.py

@@ -76,6 +76,21 @@ def resolve_pep621(
     return pep621_data
 
 
+def _resolve_absolute_path(path: Path, root_directory: Path) -> Path:
+    """Convert a path to absolute, using root_directory as base for relative paths.
+
+    Args:
+        path: The path to resolve
+        root_directory: The base directory for relative paths
+
+    Returns:
+        The absolute path
+    """
+    if path.is_absolute():
+        return path
+    return root_directory / path
+
+
 class PluginBuildData(CPPythonModel):
     """Data needed to construct CoreData"""
 
@@ -114,34 +129,20 @@ def resolve_cppython(
     """
     root_directory = project_data.project_root.absolute()
 
-    # Add the base path to all relative paths
+    # Resolve configuration path
     modified_configuration_path = local_configuration.configuration_path
-
-    # TODO: Grab configuration from the project, user, or system
     if modified_configuration_path is None:
         modified_configuration_path = root_directory / 'cppython.json'
+    else:
+        modified_configuration_path = _resolve_absolute_path(modified_configuration_path, root_directory)
 
-    if not modified_configuration_path.is_absolute():
-        modified_configuration_path = root_directory / modified_configuration_path
-
-    modified_install_path = local_configuration.install_path
-
-    if not modified_install_path.is_absolute():
-        modified_install_path = root_directory / modified_install_path
-
-    modified_tool_path = local_configuration.tool_path
-
-    if not modified_tool_path.is_absolute():
-        modified_tool_path = root_directory / modified_tool_path
-
-    modified_build_path = local_configuration.build_path
-
-    if not modified_build_path.is_absolute():
-        modified_build_path = root_directory / modified_build_path
+    # Resolve other paths
+    modified_install_path = _resolve_absolute_path(local_configuration.install_path, root_directory)
+    modified_tool_path = _resolve_absolute_path(local_configuration.tool_path, root_directory)
+    modified_build_path = _resolve_absolute_path(local_configuration.build_path, root_directory)
 
     modified_provider_name = plugin_build_data.provider_name
     modified_generator_name = plugin_build_data.generator_name
-
     modified_scm_name = plugin_build_data.scm_name
 
     # Extract provider and generator configuration data

cppython/data.py

@@ -3,6 +3,8 @@
 from dataclasses import dataclass
 from logging import Logger
 
+from packaging.requirements import Requirement
+
 from cppython.core.plugin_schema.generator import Generator
 from cppython.core.plugin_schema.provider import Provider
 from cppython.core.plugin_schema.scm import SCM
@@ -71,8 +73,6 @@ def get_active_dependencies(self) -> list:
         Returns:
             Combined list of Requirement objects from base and active groups
         """
-        from packaging.requirements import Requirement
-
         dependencies: list[Requirement] = list(self._core_data.cppython_data.dependencies)
 
         if self._active_groups:

cppython/plugins/vcpkg/plugin.py

@@ -231,8 +231,12 @@ async def download_tooling(cls, directory: Path) -> None:
 
         cls._update_provider(directory)
 
-    def install(self) -> None:
-        """Called when dependencies need to be installed from a lock file."""
+    def install(self, groups: list[str] | None = None) -> None:
+        """Called when dependencies need to be installed from a lock file.
+
+        Args:
+            groups: Optional list of dependency group names to install (currently not used by vcpkg)
+        """
         manifest_directory = self.core_data.project_data.project_root
         manifest = generate_manifest(self.core_data, self.data)
 
@@ -257,8 +261,12 @@ def install(self) -> None:
         except subprocess.CalledProcessError as e:
             self._handle_subprocess_error(logger, 'install project dependencies', e, ProviderInstallationError)
 
-    def update(self) -> None:
-        """Called when dependencies need to be updated and written to the lock file."""
+    def update(self, groups: list[str] | None = None) -> None:
+        """Called when dependencies need to be updated and written to the lock file.
+
+        Args:
+            groups: Optional list of dependency group names to update (currently not used by vcpkg)
+        """
         manifest_directory = self.core_data.project_data.project_root
 
         manifest = generate_manifest(self.core_data, self.data)

cppython/test/mock/provider.py

@@ -83,12 +83,20 @@ async def download_tooling(cls, directory: DirectoryPath) -> None:
         """Downloads the provider tooling"""
         cls.downloaded = directory
 
-    def install(self) -> None:
-        """Installs the provider"""
+    def install(self, groups: list[str] | None = None) -> None:
+        """Installs the provider
+
+        Args:
+            groups: Optional list of dependency group names to install
+        """
         pass
 
-    def update(self) -> None:
-        """Updates the provider"""
+    def update(self, groups: list[str] | None = None) -> None:
+        """Updates the provider
+
+        Args:
+            groups: Optional list of dependency group names to update
+        """
         pass
 
     def publish(self) -> None:

tests/fixtures/conan.py

@@ -51,7 +51,7 @@ def clean_conan_cache(tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
     if user_profiles.exists():
         test_profiles = conan_home / 'profiles'
         test_profiles.mkdir(parents=True, exist_ok=True)
-        
+
         for profile_file in ('default', 'default_build'):
             if (src := user_profiles / profile_file).exists():
                 src.copy(test_profiles / profile_file)