From 47a31fc61c8c98b314eff150e80db84e4343f42f Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 22 Jan 2025 10:13:24 -0500 Subject: [PATCH] Treat version mismatch errors as non-fatal in fast paths (#10860) ## Summary I noticed that we're only handling `Error::WheelMetadataNameMismatch` here; but `Error::WheelMetadataVersionMismatch` should also be treated as non-fatal. --- crates/uv-distribution/src/source/mod.rs | 28 +++++++----------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/crates/uv-distribution/src/source/mod.rs b/crates/uv-distribution/src/source/mod.rs index 88ccd9d0c..cf0996637 100644 --- a/crates/uv-distribution/src/source/mod.rs +++ b/crates/uv-distribution/src/source/mod.rs @@ -1527,12 +1527,9 @@ impl<'a, T: BuildContext> SourceDistributionBuilder<'a, T> { hashes: vec![], }); } - Err(Error::WheelMetadataNameMismatch { metadata, given }) => { - debug!( - "Ignoring `pyproject.toml` from GitHub for: {source} (metadata: {metadata}, given: {given})" - ); + Err(err) => { + debug!("Ignoring `pyproject.toml` from GitHub for {source}: {err}"); } - Err(err) => return Err(err), } } } @@ -2371,12 +2368,9 @@ impl StaticMetadata { Ok(()) => { return Ok(Self::Some(metadata)); } - Err(Error::WheelMetadataNameMismatch { metadata, given }) => { - debug!( - "Ignoring `pyproject.toml` for: {source} (metadata: {metadata}, given: {given})" - ); + Err(err) => { + debug!("Ignoring `pyproject.toml` for {source}: {err}"); } - Err(err) => return Err(err), } } Err( @@ -2419,12 +2413,9 @@ impl StaticMetadata { Ok(()) => { return Ok(Self::Some(metadata)); } - Err(Error::WheelMetadataNameMismatch { metadata, given }) => { - debug!( - "Ignoring `PKG-INFO` for: {source} (metadata: {metadata}, given: {given})" - ); + Err(err) => { + debug!("Ignoring `PKG-INFO` for {source}: {err}"); } - Err(err) => return Err(err), } } Err( @@ -2451,12 +2442,9 @@ impl StaticMetadata { Ok(()) => { return Ok(Self::Some(metadata)); } - Err(Error::WheelMetadataNameMismatch { metadata, given }) => { - debug!( - "Ignoring `egg-info` for: {source} (metadata: {metadata}, given: {given})" - ); + Err(err) => { + debug!("Ignoring `egg-info` for {source}: {err}"); } - Err(err) => return Err(err), } } Err(