feat: implement v3 repodata/matchspec support in pixi spec (#6015)

Author: wolfv

Cargo.lock

@@ -175,6 +175,7 @@ fn convert_nameless_matchspec(spec: NamelessMatchSpec) -> pbt::BinaryPackageSpec
         sha256: spec.sha256,
         url: spec.url,
         license: spec.license,
+        condition: spec.condition,
     }
 }
 

crates/pixi_build_backend/src/dependencies.rs

@@ -226,6 +226,7 @@ fn binary_package_spec_to_package_dependency(
         sha256,
         url,
         license,
+        condition,
     } = binary_spec;
 
     // If the version is "*" and no other constraints are present, treat it as None
@@ -247,8 +248,9 @@ fn binary_package_spec_to_package_dependency(
         &sha256,
         &url,
         &license,
+        &condition,
     ) {
-        (None, None, None, None, None, None, None, None, None) => {
+        (None, None, None, None, None, None, None, None, None, None) => {
             version.filter(|v| v != &rattler_conda_types::VersionSpec::Any)
         }
         _ => Some(version.unwrap_or(rattler_conda_types::VersionSpec::Any)),
@@ -268,7 +270,7 @@ fn binary_package_spec_to_package_dependency(
         sha256,
         url,
         license,
-        condition: None,
+        condition,
         track_features: None,
         flags: None,
         license_family: None,
@@ -492,6 +494,30 @@ mod test {
         assert_eq!(match_spec.to_string(), "python");
     }
 
+    #[test]
+    fn test_binary_package_conversion_preserves_condition() {
+        use rattler_conda_types::{MatchSpecCondition, ParseMatchSpecOptions, RepodataRevision};
+
+        let name = PackageName::new_unchecked("numpy");
+        let condition = MatchSpecCondition::MatchSpec(Box::new(
+            MatchSpec::from_str(
+                "python >=3.10",
+                ParseMatchSpecOptions::lenient().with_repodata_revision(RepodataRevision::V3),
+            )
+            .unwrap(),
+        ));
+        let spec = BinaryPackageSpec {
+            version: Some("*".parse().unwrap()),
+            condition: Some(condition.clone()),
+            ..BinaryPackageSpec::default()
+        };
+        let match_spec = binary_package_spec_to_package_dependency(name, spec);
+        let PackageDependency::Binary(match_spec) = match_spec else {
+            panic!("expected binary dependency");
+        };
+        assert_eq!(match_spec.condition, Some(condition));
+    }
+
     /// Regression test for <https://github.com/prefix-dev/pixi/issues/4526>:
     /// `version = "*"` combined with a `build` constraint must preserve both
     /// fields so the resulting `MatchSpec` round-trips correctly through its

crates/pixi_build_backend/src/specs_conversion.rs

@@ -63,6 +63,7 @@ impl PackageSpec for pbt::PackageSpec {
                     sha256,
                     url,
                     license,
+                    condition,
                 } = spec;
 
                 version == &Some(rattler_conda_types::VersionSpec::Any)
@@ -75,6 +76,7 @@ impl PackageSpec for pbt::PackageSpec {
                     && sha256.is_none()
                     && url.is_none()
                     && license.is_none()
+                    && condition.is_none()
             }
             _ => false,
         }
@@ -131,7 +133,7 @@ impl BinarySpecExt for pbt::BinaryPackageSpec {
             license: self.license.clone(),
             extras: None,
             namespace: None,
-            condition: None,
+            condition: self.condition.clone(),
             track_features: None,
             flags: None,
             license_family: None,
@@ -166,6 +168,7 @@ mod tests {
             sha256: None,
             url: None,
             license: None,
+            condition: None,
         };
 
         let package_spec = pbt::PackageSpec::Binary(binary_spec);
@@ -199,6 +202,7 @@ mod tests {
             sha256: None,
             url: None,
             license: None,
+            condition: None,
         };
 
         let package_spec = pbt::PackageSpec::Binary(binary_spec);
@@ -230,6 +234,7 @@ mod tests {
             sha256: None,
             url: None,
             license: None,
+            condition: None,
         };
 
         let package_spec = pbt::PackageSpec::Binary(binary_spec);

crates/pixi_build_backend/src/traits/package_spec.rs

@@ -21,6 +21,7 @@ pub fn can_be_used_as_variant(spec: &pbt::PackageSpec) -> bool {
                 sha256,
                 url,
                 license,
+                condition,
             } = spec;
 
             version == &Some(VersionSpec::Any)
@@ -33,6 +34,7 @@ pub fn can_be_used_as_variant(spec: &pbt::PackageSpec) -> bool {
                 && sha256.is_none()
                 && url.is_none()
                 && license.is_none()
+                && condition.is_none()
         }
         _ => false,
     }

crates/pixi_build_backend/src/variants.rs

@@ -218,6 +218,7 @@ fn convert_package_spec_to_v1(spec: &PackageSpec) -> PbtPackageSpec {
                 sha256: None,
                 url: None,
                 license: None,
+                condition: None,
             })
         }
         PackageSpec::Source(source_spec) => {

crates/pixi_build_backend/tests/integration/common/model.rs

@@ -423,6 +423,7 @@ fn is_star_requirement(spec: &PackageSpec) -> bool {
             sha256: None,
             url: None,
             license: None,
+            condition: None,
         } => version
             .as_ref()
             .is_none_or(|v| matches!(v, VersionSpec::Any)),

crates/pixi_build_backend_passthrough/src/lib.rs

@@ -31,10 +31,13 @@ fn to_pixi_spec_v1(
                 build,
                 build_number,
                 extras: None,
+                flags: None,
                 subdir,
                 namespace: None,
                 license,
+                license_family: None,
                 condition: None,
+                track_features: None,
             } = source
             else {
                 unimplemented!(
@@ -103,7 +106,7 @@ fn to_pixi_spec_v1(
                 // These are currently explicitly ignored in the conversion
                 namespace: _,
                 extras: _,
-                condition: _,
+                condition,
                 track_features: _,
                 flags: _,
                 license_family: _,
@@ -119,6 +122,7 @@ fn to_pixi_spec_v1(
                 sha256,
                 url,
                 license,
+                condition,
             })
         }
     };

crates/pixi_build_type_conversions/src/project_model.rs

@@ -1,5 +1,6 @@
 ---
 source: crates/pixi_build_type_conversions/src/project_model.rs
+assertion_line: 300
 expression: project_model
 ---
 {
@@ -29,7 +30,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         },
         "nanobind": {
@@ -43,7 +45,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         },
         "python": {
@@ -57,7 +60,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         }
       },

crates/pixi_build_type_conversions/src/snapshots/pixi_build_type_conversions__project_model__tests__conversions_v1_docs@cpp.snap

@@ -1,5 +1,6 @@
 ---
 source: crates/pixi_build_type_conversions/src/project_model.rs
+assertion_line: 300
 expression: project_model
 ---
 {
@@ -29,7 +30,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         }
       },
@@ -45,7 +47,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         }
       },
@@ -61,7 +64,8 @@ expression: project_model
             "md5": null,
             "sha256": null,
             "url": null,
-            "license": null
+            "license": null,
+            "condition": null
           }
         }
       },