feat: improve package.xml and recipe.yaml discovery (#4808)

Author: Hofer-Julian

Cargo.lock

@@ -695,7 +695,7 @@ async fn add_git_deps() {
 
     let pixi = PixiControl::from_manifest(
         r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["win-64"]
@@ -750,7 +750,7 @@ async fn add_git_deps_with_creds() {
 
     let pixi = PixiControl::from_manifest(
         r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["linux-64"]
@@ -805,10 +805,10 @@ async fn add_git_with_specific_commit() {
 
     let pixi = PixiControl::from_manifest(
         r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
-platforms = ["win-64"]
+platforms = ["linux-64"]
 preview = ['pixi-build']"#,
     )
     .unwrap();
@@ -826,7 +826,7 @@ preview = ['pixi-build']"#,
     let git_package = lock
         .default_environment()
         .unwrap()
-        .packages(Platform::Win64)
+        .packages(Platform::Linux64)
         .unwrap()
         .find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
 
@@ -857,7 +857,7 @@ async fn add_git_with_tag() {
 
     let pixi = PixiControl::from_manifest(
         r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["win-64"]
@@ -910,7 +910,7 @@ async fn add_plain_ssh_url() {
 
     let pixi = PixiControl::from_manifest(
         r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["linux-64"]
@@ -947,7 +947,7 @@ async fn add_pypi_git() {
     let pixi = PixiControl::from_manifest(
         format!(
             r#"
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["{platform}"]

crates/pixi/tests/integration_rust/add_tests.rs

@@ -2,7 +2,7 @@
 source: crates/pixi/tests/integration_rust/add_tests.rs
 expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["win-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_deps-2.snap

@@ -1,8 +1,8 @@
 ---
 source: crates/pixi/tests/integration_rust/add_tests.rs
-expression: pixi.project().unwrap().manifest().source.to_string()
+expression: pixi.workspace().unwrap().modify().unwrap().manifest().document.to_string()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["linux-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_deps_with_creds-2.snap

@@ -2,10 +2,10 @@
 source: crates/pixi/tests/integration_rust/add_tests.rs
 expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
-platforms = ["win-64"]
+platforms = ["linux-64"]
 preview = ['pixi-build']
 
 [dependencies]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_with_specific_commit-2.snap

@@ -2,7 +2,7 @@
 source: crates/pixi/tests/integration_rust/add_tests.rs
 expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["win-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_with_tag-2.snap

@@ -1,8 +1,8 @@
 ---
 source: crates/pixi/tests/integration_rust/add_tests.rs
-expression: pixi.project().unwrap().manifest().source.to_string()
+expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["linux-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_plain_ssh_url.snap

@@ -2,7 +2,7 @@
 source: crates/pixi/tests/integration_rust/add_tests.rs
 expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
 ---
-[project]
+[workspace]
 name = "test-channel-change"
 channels = ["https://prefix.dev/conda-forge"]
 platforms = ["<PLATFORM>"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_pypi_git.snap

@@ -17,12 +17,12 @@ ordermap = { workspace = true }
 serde = { workspace = true, optional = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-url = { workspace = true }
 
 rattler_conda_types = { workspace = true }
 
 pixi_build_type_conversions = { workspace = true }
 pixi_build_types = { workspace = true }
+pixi_config = { workspace = true }
 pixi_manifest = { workspace = true }
 pixi_spec = { workspace = true }
 pixi_spec_containers = { workspace = true }

crates/pixi_build_discovery/Cargo.toml

@@ -1,10 +1,6 @@
-use std::str::FromStr;
-
 use pixi_spec::{BinarySpec, PixiSpec, SourceAnchor};
 use pixi_spec_containers::DependencyMap;
-use rattler_conda_types::{Channel, ChannelConfig, ChannelUrl};
-use url::Url;
-
+use rattler_conda_types::ChannelUrl;
 /// Describes how a backend should be instantiated.
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
@@ -149,42 +145,32 @@ impl EnvironmentSpec {
 
 impl JsonRpcBackendSpec {
     /// Constructs a new default instance for spawning a recipe build backend.
-    pub fn default_rattler_build(channel_config: &ChannelConfig) -> Self {
+    pub fn default_rattler_build(channels: Vec<ChannelUrl>) -> Self {
         const DEFAULT_BUILD_TOOL: &str = "pixi-build-rattler-build";
 
-        let conda_forge_channel = Channel::from_name("conda-forge", channel_config).base_url;
-        let backends_channel = Url::from_str("https://prefix.dev/pixi-build-backends")
-            .unwrap()
-            .into();
-
         Self {
             name: DEFAULT_BUILD_TOOL.to_string(),
             command: CommandSpec::EnvironmentSpec(Box::new(EnvironmentSpec {
                 requirement: (DEFAULT_BUILD_TOOL.parse().unwrap(), PixiSpec::any()),
                 additional_requirements: Default::default(),
                 constraints: Default::default(),
-                channels: vec![conda_forge_channel, backends_channel],
+                channels,
                 command: None,
             })),
         }
     }
 
     /// Constructs a new default instance for spawning a ROS build backend.
-    pub fn default_ros_build(channel_config: &ChannelConfig) -> Self {
+    pub fn default_ros_build(channels: Vec<ChannelUrl>) -> Self {
         const DEFAULT_BUILD_TOOL: &str = "pixi-build-ros";
 
-        let conda_forge_channel = Channel::from_name("conda-forge", channel_config).base_url;
-        let backends_channel = Url::from_str("https://prefix.dev/pixi-build-backends")
-            .unwrap()
-            .into();
-
         Self {
             name: DEFAULT_BUILD_TOOL.to_string(),
             command: CommandSpec::EnvironmentSpec(Box::new(EnvironmentSpec {
                 requirement: (DEFAULT_BUILD_TOOL.parse().unwrap(), PixiSpec::any()),
                 additional_requirements: Default::default(),
                 constraints: Default::default(),
-                channels: vec![conda_forge_channel, backends_channel],
+                channels,
                 command: None,
             })),
         }