Partial fix for failing test.

Author: hameerabbasi

crates/pixi_cli/src/upgrade.rs

@@ -5,7 +5,7 @@ use fancy_display::FancyDisplay;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use miette::{IntoDiagnostic, MietteDiagnostic, WrapErr};
-use pep508_rs::{MarkerTree, Requirement};
+use pep508_rs::Requirement;
 use pixi_config::ConfigCli;
 use pixi_core::{
     WorkspaceLocator,
@@ -473,8 +473,7 @@ pub fn parse_specs_for_platform(
                 Requirement {
                     name: name.as_normalized().clone(),
                     extras: req.extras.clone(),
-                    // TODO: Add marker support here to avoid overwriting existing markers
-                    marker: MarkerTree::default(),
+                    marker: req.env_markers.clone(),
                     origin: None,
                     version_or_url: None,
                 },

crates/pixi_core/src/lock_file/resolve/pypi.rs

@@ -347,15 +347,6 @@ pub async fn resolve_pypi(
         tracing::info!("there are no python packages installed by conda");
     }
 
-    let mut requirements = dependencies
-        .into_iter()
-        .flat_map(|(name, req)| {
-            req.into_iter()
-                .map(move |r| as_uv_req(&r, name.as_ref(), project_root))
-        })
-        .collect::<Result<Vec<_>, _>>()
-        .into_diagnostic()?;
-
     // Determine the python interpreter that is installed as part of the conda
     // packages.
     let python_record = locked_pixi_records
@@ -371,6 +362,16 @@ pub async fn resolve_pypi(
     // Construct the marker environment for the target platform
     let marker_environment = determine_marker_environment(platform, python_record.as_ref())?;
 
+    let mut requirements = dependencies
+        .into_iter()
+        .flat_map(|(name, req)| {
+            req.into_iter()
+                .map(move |r| as_uv_req(&r, name.as_ref(), project_root))
+        })
+        .filter_ok(|uv_req| uv_req.evaluate_markers(Some(&marker_environment), &uv_req.extras))
+        .collect::<Result<Vec<_>, _>>()
+        .into_diagnostic()?;
+
     // Determine the tags for this particular solve.
     let tags = get_pypi_tags(platform, &system_requirements, python_record.as_ref())?;
 

crates/pixi_pypi_spec/src/lib.rs

@@ -207,11 +207,7 @@ impl From<PixiPypiSource> for PixiPypiSpec {
 impl PixiPypiSpec {
     /// Creates a new spec with the given source and no extras.
     pub fn new(source: PixiPypiSource) -> Self {
-        PixiPypiSpec {
-            extras: Vec::new(),
-            source,
-            env_markers: MarkerTree::default(),
-        }
+        source.into()
     }
 
     /// Creates a new spec with the given source and extras.