mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 21:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove unused wheel cache argument from downloader (#248)

Browse source
This commit is contained in:
Charlie Marsh 2023-10-30 19:23:50 -07:00 • committed by GitHub
parent ae203f998a
commit 2f38701008
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/puffin-cli/src/commands/pip_sync.rs
View file

@ -138,7 +138,6 @@ pub(crate) async fn sync_requirements(
}; };
// Download any missing distributions. // Download any missing distributions.
let staging = tempfile::tempdir()?;
let downloads = if remote.is_empty() { let downloads = if remote.is_empty() {
vec![] vec![]
} else { } else {
@ -147,9 +146,7 @@ pub(crate) async fn sync_requirements(
let downloader = puffin_installer::Downloader::new(&client, cache) let downloader = puffin_installer::Downloader::new(&client, cache)
.with_reporter(DownloadReporter::from(printer).with_length(remote.len() as u64)); .with_reporter(DownloadReporter::from(printer).with_length(remote.len() as u64));
let downloads = downloader let downloads = downloader.download(remote).await?;
.download(remote, cache.unwrap_or(staging.path()))
.await?;
let s = if downloads.len() == 1 { "" } else { "s" }; let s = if downloads.len() == 1 { "" } else { "s" };
writeln!( writeln!(
@ -167,6 +164,7 @@ pub(crate) async fn sync_requirements(
}; };
// Unzip any downloaded distributions. // Unzip any downloaded distributions.
let staging = tempfile::tempdir()?;
let unzips = if downloads.is_empty() { let unzips = if downloads.is_empty() {
vec![] vec![]
} else { } else {

4
crates/puffin-dispatch/src/lib.rs
View file

@ -138,7 +138,6 @@ impl BuildContext for BuildDispatch {
}; };
// Download any missing distributions. // Download any missing distributions.
let staging = tempfile::tempdir()?;
let downloads = if remote.is_empty() { let downloads = if remote.is_empty() {
vec![] vec![]
} else { } else {
@ -148,12 +147,13 @@ impl BuildContext for BuildDispatch {
remote.iter().map(ToString::to_string).join(", ") remote.iter().map(ToString::to_string).join(", ")
); );
Downloader::new(&self.client, self.cache.as_deref()) Downloader::new(&self.client, self.cache.as_deref())
.download(remote, self.cache.as_deref().unwrap_or(staging.path())) .download(remote)
.await .await
.context("Failed to download build dependencies")? .context("Failed to download build dependencies")?
}; };
// Unzip any downloaded distributions. // Unzip any downloaded distributions.
let staging = tempfile::tempdir()?;
let unzips = if downloads.is_empty() { let unzips = if downloads.is_empty() {
vec![] vec![]
} else { } else {

6
crates/puffin-installer/src/downloader.rs
View file

@ -12,7 +12,6 @@ use pep440_rs::Version;
use puffin_client::RegistryClient; use puffin_client::RegistryClient;
use puffin_package::package_name::PackageName; use puffin_package::package_name::PackageName;
use crate::cache::WheelCache;
use crate::distribution::RemoteDistribution; use crate::distribution::RemoteDistribution;
pub struct Downloader<'a> { pub struct Downloader<'a> {
@ -44,12 +43,7 @@ impl<'a> Downloader<'a> {
pub async fn download( pub async fn download(
&'a self, &'a self,
wheels: Vec<RemoteDistribution>, wheels: Vec<RemoteDistribution>,
target: &'a Path,
) -> Result<Vec<InMemoryDistribution>> { ) -> Result<Vec<InMemoryDistribution>> {
// Create the wheel cache subdirectory, if necessary.
let wheel_cache = WheelCache::new(target);
wheel_cache.init()?;
// Sort the wheels by size. // Sort the wheels by size.
let mut wheels = wheels; let mut wheels = wheels;
wheels.sort_unstable_by_key(|wheel| Reverse(wheel.file().size)); wheels.sort_unstable_by_key(|wheel| Reverse(wheel.file().size));