incomplete state

Author: amhellmund

src/cpp_dev/dependency/conan/command_wrapper.py

@@ -88,6 +88,7 @@ def conan_graph_buildorder(conanfile_path: Path, profile: str) -> ConanGraphBuil
         "-f", "json",
         "--order-by", "recipe",
     )
+    print(stdout)
     return ConanGraphBuildOrder.model_validate_json(stdout)
 
 

src/cpp_dev/dependency/conan/provider.py

@@ -12,7 +12,8 @@
 from cpp_dev.common.types import CppStandard
 from cpp_dev.common.utils import create_tmp_dir
 from cpp_dev.common.version import SemanticVersion
-from cpp_dev.dependency.conan.command_wrapper import conan_list
+from cpp_dev.dependency.conan.command_wrapper import (conan_graph_buildorder,
+                                                      conan_list)
 from cpp_dev.dependency.conan.setup import CONAN_REMOTE
 from cpp_dev.dependency.conan.types import ConanPackageReference
 from cpp_dev.dependency.conan.utils import conan_env, create_conanfile
@@ -25,8 +26,9 @@
 
 class ConanDependencyProvider(DependencyProvider):
 
-    def __init__(self, conan_home_dir: Path) -> None:
+    def __init__(self, conan_home_dir: Path, profile: str) -> None:
         self._conan_home_dir = conan_home_dir
+        self._profile = profile
 
     def fetch_versions(self, repository: str, name: str) -> list[SemanticVersion]:
         with conan_env(self._conan_home_dir):
@@ -38,9 +40,9 @@ def collect_dependency_hull(self, deps: list[DependencySpecifier]) -> list[Depen
         with conan_env(self._conan_home_dir):
             with create_tmp_dir() as tmp_dir:
                 conanfile_path = create_conanfile(tmp_dir, deps)
-        #     with create_tmp_dir() as tmp_dir:
-        #     conanfile_path = create_conanfile(tmp_dir, package_refs)
-        ...
+                build_order = conan_graph_buildorder(conanfile_path, self._profile)
+                print(build_order)
+                
 
     def install_dependencies(self, deps: list[DependencySpecifier]) -> list[DependencySpecifier]:
         ... # Implementation using Conan package manager

src/cpp_dev/project/core.py

@@ -18,6 +18,7 @@
     load_project_config,
     store_project_config,
     update_dependencies,
+    validate_dependencies,
 )
 from .lockfile import create_initial_lock_file
 from .path_composition import compose_include_file, compose_source_file
@@ -44,6 +45,7 @@ def add_package_dependency(self, deps: list[DependencySpecifier], dep_type: Depe
         refined_deps = _refine_package_dependencies(self._dependency_provider, deps)
         project_config = load_project_config(self.project_dir)
         update_dependencies(project_config, refined_deps, dep_type)
+        validate_dependencies(project_config)
         dependency_hull = _obtain_dependency_hull(project_config, self._dependency_provider)
 
         store_project_config(self.project_dir, project_config)

src/tests/cpp_dev/dependency/conan/test_provider.py

@@ -12,6 +12,8 @@
 from cpp_dev.common.version import SemanticVersion
 from cpp_dev.dependency.conan.provider import ConanDependencyProvider
 from cpp_dev.dependency.conan.types import ConanPackageReference
+from cpp_dev.dependency.provider import DependencyIdentifier
+from cpp_dev.dependency.specifier import DependencySpecifier
 from tests.cpp_dev.dependency.conan.utils.env import (ConanTestEnv,
                                                       ConanTestPackage,
                                                       create_conan_test_env)
@@ -20,6 +22,11 @@
 @pytest.fixture
 def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[ConanTestEnv]:
     TEST_PACKAGES = [
+        ConanTestPackage(
+            ref=ConanPackageReference("dep/1.0.0@official/cppdev"),
+            dependencies=[],
+            cpp_standard="c++17",
+        ),
         ConanTestPackage(
             ref=ConanPackageReference("cpd/1.0.0@official/cppdev"),
             dependencies=[],
@@ -32,7 +39,9 @@ def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[C
         ),
         ConanTestPackage(
             ref=ConanPackageReference("cpd/3.0.0@official/cppdev"),
-            dependencies=[],
+            dependencies=[
+                ConanPackageReference("dep/1.0.0@official/cppdev")
+            ],
             cpp_standard="c++17",
         ),
     ]
@@ -41,8 +50,19 @@ def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[C
 
 
 def test_get_available_versions(conan_test_environment: ConanTestEnv) -> None:
-    provider = ConanDependencyProvider(conan_test_environment.conan_home_dir)
+    provider = ConanDependencyProvider(conan_test_environment.conan_home_dir, conan_test_environment.profile)
     assert provider.fetch_versions("official", "cpd") == [
         SemanticVersion("3.0.0"),
         SemanticVersion("1.0.0"),
-    ]
+    ]
+
+
+def test_collect_dependency_hull(conan_test_environment: ConanTestEnv) -> None:
+    provider = ConanDependencyProvider(conan_test_environment.conan_home_dir, conan_test_environment.profile)
+    deps = [
+        DependencySpecifier("official/cpd[>=3.0.0]"),
+    ]
+    dependencies = provider.collect_dependency_hull(deps)
+    assert len(dependencies) == 2
+    assert dependencies[0].id == DependencyIdentifier("official/cpd/3.0.0")
+    assert dependencies[1].id == DependencyIdentifier("official/dep/1.0.0")