update to latest development versions

Author: wolfv

Cargo.lock

@@ -6,25 +6,25 @@ resolver = "2"
 edition = "2021"
 
 [workspace.dependencies]
-async-trait = "0.1.82"
-chrono = "0.4.38"
-clap = "4.5.20"
-clap-verbosity-flag = "3.0.1"
-fs-err = "3.0.0"
-indexmap = "2.7.0"
-itertools = "0.13.0"
-log = "0.4.22"
-miette = "7.4.0"
+async-trait = "0.1.86"
+chrono = "0.4.39"
+clap = "4.5.29"
+clap-verbosity-flag = "3.0.2"
+fs-err = "3.1.0"
+indexmap = "2.7.1"
+itertools = "0.14.0"
+log = "0.4.25"
+miette = "7.5.0"
 minijinja = "2.7.0"
 parking_lot = "0.12.3"
-reqwest = "0.12.5"
+reqwest = "0.12.12"
 reqwest-middleware = "0.4.0"
 serde = "1.0"
 serde_yaml = "0.9"
 serde_json = "1.0"
-tempfile = "3.10.1"
-toml_edit = "0.22.22"
-tokio = "1.37.0"
+tempfile = "3.16.0"
+toml_edit = "0.22.24"
+tokio = "1.43.0"
 tracing-subscriber = "0.3.19"
 url = "2.5.4"
 pyproject-toml = "0.13.4"
@@ -35,14 +35,14 @@ jsonrpc-stdio-server = "18.0.0"
 jsonrpc-http-server = "18.0.0"
 jsonrpc-core = "18.0.0"
 
-rattler-build = { git = "https://github.com/prefix-dev/rattler-build", rev = "3ed52d1", default-features = false }
+rattler-build = { git = "https://github.com/prefix-dev/rattler-build", rev = "674439811c9b67c5928115a594fa168f0eee0cbc", default-features = false }
 
-rattler_conda_types = { version = "0.30.0", default-features = false }
-rattler_package_streaming = { version = "0.22.22", default-features = false }
-rattler_virtual_packages = { version = "2.0.1", default-features = false }
+rattler_conda_types = { version = "0.30.2", default-features = false }
+rattler_package_streaming = { version = "0.22.27", default-features = false }
+rattler_virtual_packages = { version = "2.0.2", default-features = false }
 
-pixi_build_types = { git = "https://github.com/prefix-dev/pixi", branch = "main" }
-pixi_consts = { git = "https://github.com/prefix-dev/pixi", branch = "main" }
-pixi_manifest = { git = "https://github.com/prefix-dev/pixi", branch = "main" }
-pixi_spec = { git = "https://github.com/prefix-dev/pixi", branch = "main" }
-pixi_build_type_conversions = { git = "https://github.com/prefix-dev/pixi", branch = "main" }
+pixi_build_types = { path = "../pixi/crates/pixi_build_types" }
+pixi_consts = { path = "../pixi/crates/pixi_consts" }
+pixi_manifest = { path = "../pixi/crates/pixi_manifest" }
+pixi_spec = { path = "../pixi/crates/pixi_spec" }
+pixi_build_type_conversions = { path = "../pixi/crates/pixi_build_type_conversions" }

Cargo.toml

@@ -44,5 +44,5 @@ jsonrpc-http-server = { workspace = true }
 jsonrpc-core = { workspace = true }
 
 [dev-dependencies]
-insta = { version = "1.41.1", features = ["yaml", "redactions", "filters"] }
-toml_edit = { version = "0.22.22" }
+insta = { version = "1.42.1", features = ["yaml", "redactions", "filters"] }
+toml_edit = { version = "0.22.24" }

crates/pixi-build/Cargo.toml

@@ -189,6 +189,7 @@ impl Protocol for CMakeBuildBackend {
         Ok(CondaMetadataResult {
             packages,
             input_globs: None,
+            additional_hash: None,
         })
     }
 

crates/pixi-build/src/bin/pixi-build-cmake/protocol.rs

@@ -197,6 +197,7 @@ impl Protocol for PythonBuildBackend {
         Ok(CondaMetadataResult {
             packages,
             input_globs: None,
+            additional_hash: None,
         })
     }
 

crates/pixi-build/src/bin/pixi-build-python/protocol.rs

@@ -185,6 +185,7 @@ impl Protocol for RattlerBuildBackend {
         Ok(CondaMetadataResult {
             packages: solved_packages,
             input_globs: None,
+            additional_hash: None,
         })
     }
 
@@ -272,7 +273,6 @@ impl Protocol for RattlerBuildBackend {
             .with_keep_build(true)
             .finish();
 
-        eprintln!("before outputs ");
         for output in outputs {
             let temp_recipe = TemporaryRenderedRecipe::from_output(&output)?;
 

crates/pixi-build/src/bin/pixi-build-rattler-build/protocol.rs

@@ -129,11 +129,12 @@ fn project_model_v1(
     channel_config: &ChannelConfig,
 ) -> miette::Result<Option<ProjectModelV1>> {
     // Load the manifest
-    let manifest = pixi_manifest::Manifest::from_path(manifest_path)?;
-    let package = manifest.package;
+    let manifest =
+        pixi_manifest::Manifests::from_workspace_manifest_path(manifest_path.to_path_buf())?;
+    let package = manifest.value.package.as_ref();
     // This can be null in the rattler-build backend
     Ok(package.map(|manifest| {
-        to_project_model_v1(&manifest, channel_config)
+        to_project_model_v1(&manifest.value, channel_config)
             .expect("failed to convert manifest to project model")
     }))
 }

crates/pixi-build/src/cli.rs

@@ -1,18 +1,15 @@
-use std::{path::Path, str::FromStr, sync::OnceLock};
+use std::{path::PathBuf, str::FromStr, sync::OnceLock};
 
-use pixi_manifest::Manifest;
+use pixi_manifest::Manifests;
 use rattler_conda_types::{ChannelConfig, ParseChannelError, Platform, Version};
 use reqwest::Url;
 
 pub trait ManifestExt {
-    fn manifest(&self) -> &Manifest;
+    fn manifest(&self) -> &Manifests;
 
     /// Returns the path to the root directory that contains the manifest.
-    fn manifest_root(&self) -> &Path {
-        self.manifest()
-            .path
-            .parent()
-            .expect("manifest path should have a parent")
+    fn manifest_root(&self) -> PathBuf {
+        self.manifest().workspace.provenance.absolute_path()
     }
 
     /// Returns the resolved channels that are specified in the manifest
@@ -25,6 +22,7 @@ pub trait ManifestExt {
     ) -> Result<Vec<Url>, ParseChannelError> {
         self.manifest()
             .workspace
+            .value
             .workspace
             .channels
             .iter()
@@ -42,9 +40,9 @@ pub trait ManifestExt {
     fn supports_target_platform(&self, platform: Platform) -> bool {
         self.manifest()
             .workspace
+            .value
             .workspace
             .platforms
-            .value
             .contains(&platform)
     }
 
@@ -53,7 +51,7 @@ pub trait ManifestExt {
     /// Note that this may be `None` because having a version is not required.
     /// Use [`Self::version_or_default`] to get a default version in that case.
     fn version(&self) -> Option<&Version> {
-        self.manifest().workspace.workspace.version.as_ref()
+        self.manifest().workspace.value.workspace.version.as_ref()
     }
 
     /// Returns the version of the project or a default version if no version is
@@ -65,8 +63,8 @@ pub trait ManifestExt {
     }
 }
 
-impl ManifestExt for Manifest {
-    fn manifest(&self) -> &Manifest {
+impl ManifestExt for Manifests {
+    fn manifest(&self) -> &Manifests {
         self
     }
 }
@@ -75,7 +73,7 @@ impl ManifestExt for Manifest {
 mod tests {
     use std::path::Path;
 
-    use pixi_manifest::Manifest;
+    use pixi_manifest::{ManifestKind, ManifestProvenance, Manifests, WithProvenance};
 
     #[test]
     fn test_manifest_root() {
@@ -97,6 +95,11 @@ mod tests {
             "#;
 
         let manifest_path = Path::new("pixi.toml");
-        Manifest::from_str(manifest_path, raw_manifest).unwrap();
+        let provenance = WithProvenance::new(
+            raw_manifest,
+            ManifestProvenance::new(manifest_path.to_path_buf(), ManifestKind::Pixi),
+        );
+
+        Manifests::from_workspace_source(provenance);
     }
 }