wip: fix early outs

Author: baszalmstra

crates/pixi_core/src/lock_file/update.rs

@@ -28,9 +28,10 @@ use pixi_install_pypi::{
     LazyEnvironmentVariables, PyPIBuildConfig, PyPIContextConfig, PyPIEnvironmentUpdater,
     PyPIUpdateConfig,
 };
-use pixi_manifest::{ChannelPriority, EnvironmentName, FeaturesExt, HasFeaturesIter};
+use pixi_manifest::{ChannelPriority, EnvironmentName, FeaturesExt};
 use pixi_progress::global_multi_progress;
 use pixi_record::{ParseLockFileError, PixiRecord};
+use pixi_spec::SourceSpec;
 use pixi_utils::prefix::Prefix;
 use pixi_uv_context::UvResolutionContext;
 use pixi_uv_conversions::{
@@ -1907,35 +1908,27 @@ pub enum TaskResult {
 
 /// Expands develop dependencies for a grouped environment.
 ///
-/// Collects all develop dependencies from the features of the grouped environment,
-/// converts them to DependencyOnlySource format, and uses the command dispatcher
-/// to expand them into their build/host/run dependencies.
+/// Takes the develop dependencies, converts them to DependencyOnlySource format,
+/// and uses the command dispatcher to expand them into their build/host/run dependencies.
 ///
 /// Returns `None` if there are no develop dependencies.
 async fn expand_develop_dependencies(
-    group: &GroupedEnvironment<'_>,
+    develop_dependencies: IndexMap<PackageName, SourceSpec>,
+    group_name: GroupedEnvironmentName,
     platform: Platform,
     channel_config: &ChannelConfig,
     channels: &[ChannelUrl],
     virtual_packages: &[GenericVirtualPackage],
     variants: &BTreeMap<String, Vec<String>>,
     command_dispatcher: &CommandDispatcher,
 ) -> Result<Option<ExpandedDevSources>, SolveCondaEnvironmentError> {
-    // Collect develop dependencies from all features in the group
-    let mut develop_deps = IndexMap::new();
-    for feature in group.features() {
-        if let Some(deps) = feature.develop_dependencies(Some(platform)) {
-            develop_deps.extend(deps.into_owned());
-        }
-    }
-
     // If there are no develop dependencies, return early
-    if develop_deps.is_empty() {
+    if develop_dependencies.is_empty() {
         return Ok(None);
     }
 
     // Convert to Vec<DependencyOnlySource>
-    let dev_sources: Vec<DependencyOnlySource> = develop_deps
+    let dev_sources: Vec<DependencyOnlySource> = develop_dependencies
         .into_iter()
         .map(|(name, spec)| DependencyOnlySource {
             source: spec,
@@ -1959,7 +1952,7 @@ async fn expand_develop_dependencies(
         .await
         .map_err(
             |source| SolveCondaEnvironmentError::ExpandDevSourcesFailed {
-                environment_name: group.name(),
+                environment_name: group_name,
                 platform,
                 source,
             },
@@ -1981,15 +1974,18 @@ async fn spawn_solve_conda_environment_task(
     // Get the dependencies for this platform
     let dependencies = group.combined_dependencies(Some(platform));
 
+    // Get the develop dependencies for this platform
+    let develop_dependencies = group.combined_develop_dependencies(Some(platform));
+
     // Get solve options
     let exclude_newer = group.exclude_newer();
     let strategy = group.solve_strategy();
 
     // Get the environment name
     let group_name = group.name();
 
-    // Early out if there are no dependencies to solve.
-    if dependencies.is_empty() {
+    // Early out if there are no dependencies to solve and no develop dependencies to expand.
+    if dependencies.is_empty() && develop_dependencies.is_empty() {
         return Ok(TaskResult::CondaGroupSolved(
             group_name,
             platform,
@@ -2028,7 +2024,8 @@ async fn spawn_solve_conda_environment_task(
 
     // Expand develop dependencies if any
     let expanded_develop = expand_develop_dependencies(
-        &group,
+        develop_dependencies,
+        group_name.clone(),
         platform,
         &channel_config,
         &channels,
@@ -2051,6 +2048,16 @@ async fn spawn_solve_conda_environment_task(
         Default::default()
     };
 
+    // Early out if the final combined dependencies are still empty after expansion
+    if dependencies.is_empty() {
+        return Ok(TaskResult::CondaGroupSolved(
+            group_name,
+            platform,
+            PixiRecordsByName::default(),
+            Duration::default(),
+        ));
+    }
+
     let start = Instant::now();
 
     // Solve the environment using the command dispatcher.

crates/pixi_core/src/workspace/grouped_environment.rs

@@ -2,14 +2,16 @@ use std::fmt::Display;
 use std::path::PathBuf;
 
 use fancy_display::FancyDisplay;
+use indexmap::IndexMap;
 use itertools::Either;
 use pixi_consts::consts;
 use pixi_manifest::{
     EnvironmentName, Feature, HasFeaturesIter, HasWorkspaceManifest, SystemRequirements,
     WorkspaceManifest,
 };
+use pixi_spec::SourceSpec;
 use pixi_utils::prefix::Prefix;
-use rattler_conda_types::{ChannelConfig, GenericVirtualPackage, Platform};
+use rattler_conda_types::{ChannelConfig, GenericVirtualPackage, PackageName, Platform};
 
 use crate::{
     Workspace,
@@ -121,6 +123,24 @@ impl<'p> GroupedEnvironment<'p> {
     pub fn channel_config(&self) -> ChannelConfig {
         self.workspace().channel_config()
     }
+
+    /// Returns the combined develop dependencies for this grouped environment.
+    ///
+    /// Develop dependencies from all features in the group are collected and
+    /// merged. If multiple features define the same develop dependency, the
+    /// last one wins (later features override earlier ones).
+    pub fn combined_develop_dependencies(
+        &self,
+        platform: Option<Platform>,
+    ) -> IndexMap<PackageName, SourceSpec> {
+        let mut result = IndexMap::new();
+        for feature in self.features() {
+            if let Some(deps) = feature.develop_dependencies(platform) {
+                result.extend(deps.into_owned());
+            }
+        }
+        result
+    }
 }
 
 impl<'p> HasWorkspaceRef<'p> for GroupedEnvironment<'p> {