wip

prefix-dev · Sep 5, 2024 · 184028d · 184028d
1 parent dbd0e88
commit 184028d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,11 +24,11 @@ jsonrpc-stdio-server = "18.0.0"
 jsonrpc-http-server = "18.0.0"
 jsonrpc-core = "18.0.0"
 
-rattler-build = { git = "https://github.com/baszalmstra/rattler-build", branch = "refactor/no_default_build_string", default-features = false }
-rattler_conda_types = "0.27.1"
-rattler_package_streaming = "0.22.1"
+rattler-build = { git = "https://github.com/prefix-dev/rattler-build", branch = "main", default-features = false }
+rattler_conda_types = "0.27.4"
+rattler_package_streaming = "0.22.5"
 
-pixi_build_types = { git = "https://github.com/tdejager/pixi", branch = "feat/pixi-build-frontend" }
-pixi_consts = { git = "https://github.com/tdejager/pixi", branch = "feat/pixi-build-frontend" }
-pixi_manifest = { git = "https://github.com/tdejager/pixi", branch = "feat/pixi-build-frontend" }
-pixi_spec = { git = "https://github.com/tdejager/pixi", branch = "feat/pixi-build-frontend" }
+pixi_build_types = { path="../pixi-build-branch/crates/pixi_build_types" }
+pixi_consts = { path="../pixi-build-branch/crates/pixi_consts" }
+pixi_manifest = { path="../pixi-build-branch/crates/pixi_manifest" }
+pixi_spec = { path="../pixi-build-branch/crates/pixi_spec" }
diff --git a/crates/pixi-build-python/src/main.rs b/crates/pixi-build-python/src/main.rs
@@ -268,6 +268,7 @@ async fn get_conda_metadata_from_manifest(
         finalized_sources: None,
         build_summary: Arc::default(),
         system_tools: Default::default(),
+        extra_meta: None,
     };
     let tool_config = get_tool_configuration(logging_output_handler, &channel_config)?;
 
@@ -290,28 +291,25 @@ async fn get_conda_metadata_from_manifest(
     Ok(CondaMetadataResult {
         packages: vec![CondaPackageMetadata {
             name: output.name().clone(),
-            version: output.version().clone(),
+            version: output.version().clone().into(),
             build: output.build_string().into_owned(),
             build_number: output.recipe.build.number,
             subdir: output.build_configuration.target_platform,
-            depends: Some(
-                finalized_deps
-                    .depends
-                    .iter()
-                    .map(DependencyInfo::spec)
-                    .cloned()
-                    .collect(),
-            ),
-            constrains: Some(
-                finalized_deps
-                    .constraints
-                    .iter()
-                    .map(DependencyInfo::spec)
-                    .cloned()
-                    .collect(),
-            ),
+            depends: finalized_deps
+                .depends
+                .iter()
+                .map(DependencyInfo::spec)
+                .cloned()
+                .collect(),
+            constraints: finalized_deps
+                .constraints
+                .iter()
+                .map(DependencyInfo::spec)
+                .cloned()
+                .collect(),
             license: output.recipe.about.license.map(|l| l.to_string()),
             license_family: output.recipe.about.license_family,
+            noarch: output.recipe.build.noarch
         }],
     })
 }
@@ -348,6 +346,7 @@ async fn build_manifest(
         finalized_sources: None,
         build_summary: Arc::default(),
         system_tools: Default::default(),
+        extra_meta: None,
     };
     let tool_config = get_tool_configuration(logging_output_handler, &channel_config)?;
 
@@ -480,7 +479,7 @@ fn manifest_to_recipe(
         })],
         build: Build {
             number: build_number,
-            string: None,
+            string: Default::default(),
 
             // skip: Default::default(),
             script: ScriptContent::Commands(