Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid returning zipped wheels from registry and URL indexes (#558) 

## Summary

This is hard to reproduce, but if you run a long installation process
that errors part-way through, you can end up with zipped wheels in the
`Wheels` cache, which is intended to contain only unzipped wheels. This
PR avoids returning those entries from the registry, which will then
lead to errors downstream when we treat them as directories.
This commit is contained in:
Charlie Marsh 2023-12-05 03:53:45 -05:00 committed by GitHub
parent 2d1e19e474
commit f99e3560e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/puffin-distribution/src/distribution_database.rs
View File

@ -103,7 +103,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
} }
} }
/// In parallel, either fetch the wheel or fetch and built source distributions. /// In parallel, either fetch each wheel or build each source distribution.
pub async fn get_wheels( pub async fn get_wheels(
&self, &self,
dists: Vec<Dist>, dists: Vec<Dist>,
@ -191,7 +191,7 @@ impl<'a, Context: BuildContext + Send + Sync> DistributionDatabase<'a, Context>
small_size.map_or("unknown size".to_string(), |size| size.to_string()); small_size.map_or("unknown size".to_string(), |size| size.to_string());
debug!("Fetching disk-based wheel from registry: {dist} ({size})"); debug!("Fetching disk-based wheel from registry: {dist} ({size})");
// Download the wheel to a temporary file. // Download the wheel into the cache.
fs::create_dir_all(&cache_entry.dir).await?; fs::create_dir_all(&cache_entry.dir).await?;
let mut writer = fs::File::create(cache_entry.path()).await?; let mut writer = fs::File::create(cache_entry.path()).await?;
tokio::io::copy(&mut reader.compat(), &mut writer).await?; tokio::io::copy(&mut reader.compat(), &mut writer).await?;

9
crates/puffin-installer/src/plan.rs
View File

@ -131,17 +131,16 @@ impl InstallPlan {
WheelCache::Url(url).wheel_dir(), WheelCache::Url(url).wheel_dir(),
disk_filename.to_string(), disk_filename.to_string(),
); );
if cache_entry.path().exists() {
// TODO(charlie): This takes advantage of the fact that for URL dependencies, the package ID // Ignore zipped wheels, which represent intermediary cached artifacts.
// and distribution ID are identical. We should either change the cache layout to use if cache_entry.path().is_dir() {
// distribution IDs, or implement package ID for URL.
let cached_dist = CachedDirectUrlDist::from_url( let cached_dist = CachedDirectUrlDist::from_url(
filename, filename,
url.clone(), url.clone(),
cache_entry.path(), cache_entry.path(),
); );
debug!("Url wheel requirement already cached: {cached_dist}"); debug!("URL wheel requirement already cached: {cached_dist}");
local.push(CachedDist::Url(cached_dist.clone())); local.push(CachedDist::Url(cached_dist.clone()));
continue; continue;
} }

5
crates/puffin-installer/src/registry_index.rs
View File

@ -41,6 +41,11 @@ impl RegistryIndex {
} }
}; };
// Ignore zipped wheels, which represent intermediary cached artifacts.
if !path.is_dir() {
continue;
}
match CachedRegistryDist::try_from_path(&path) { match CachedRegistryDist::try_from_path(&path) {
Ok(None) => {} Ok(None) => {}
Ok(Some(dist_info)) => { Ok(Some(dist_info)) => {