mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-01 12:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename sourcedist to sdist in lockfile (#3590)

Browse source 
## Summary

I think this is more consistent with Brett's proposal and looks more
natural to me as a user. What do you think, @BurntSushi?
This commit is contained in:
Charlie Marsh 2024-05-14 16:56:00 -04:00 • committed by GitHub
parent f4cd7d627a
commit 7363f31ceb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/uv-resolver/src/lock.rs
View file

@ -164,7 +164,7 @@ impl TryFrom<LockWire> for Lock {
// Also check that our sources are consistent with whether we have
// hashes or not.
let requires_hash = dist.id.source.kind.requires_hash();
if let Some(ref sdist) = dist.sourcedist {
if let Some(ref sdist) = dist.sdist {
if requires_hash != sdist.hash.is_some() {
return Err(LockError::hash(
dist.id.clone(),
@ -194,7 +194,7 @@ pub(crate) struct Distribution {
#[serde(default)]
pub(crate) marker: Option<String>,
#[serde(default)]
pub(crate) sourcedist: Option<SourceDist>,
pub(crate) sdist: Option<SourceDist>,
#[serde(default, rename = "wheel", skip_serializing_if = "Vec::is_empty")]
pub(crate) wheels: Vec<Wheel>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
@ -206,19 +206,19 @@ impl Distribution {
resolved_dist: &ResolvedDist,
) -> Result<Distribution, LockError> {
let id = DistributionId::from_resolved_dist(resolved_dist);
let mut sourcedist = None;
let mut sdist = None;
let mut wheels = vec![];
if let Some(wheel) = Wheel::from_resolved_dist(resolved_dist)? {
wheels.push(wheel);
} else if let Some(sdist) = SourceDist::from_resolved_dist(resolved_dist)? {
sourcedist = Some(sdist);
if let Some(dist) = Wheel::from_resolved_dist(resolved_dist)? {
wheels.push(dist);
} else if let Some(dist) = SourceDist::from_resolved_dist(resolved_dist)? {
sdist = Some(dist);
}
Ok(Distribution {
id,
// TODO: Refactoring is needed to get the marker expressions for a
// particular resolved dist to this point.
marker: None,
sourcedist,
sdist,
wheels,
dependencies: vec![],
})

2
crates/uv-resolver/src/snapshots/uv_resolver__lock__tests__hash_optional_missing.snap
View file

@ -28,7 +28,7 @@ Ok(
},
},
marker: None,
sourcedist: None,
sdist: None,
wheels: [
Wheel {
url: Url {