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

Move PyPI-oriented types out of puffin-client crate (#255)

Browse source 
Just an internal change to avoid a dependency on `puffin-client` for
those crates that need access to PyPI-metadata types.
This commit is contained in:
Charlie Marsh 2023-10-31 10:10:23 -07:00 • committed by GitHub
parent 08f09e4743
commit 16aac834ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/puffin-resolver/src/distribution.rs
View file

@ -1,6 +1,7 @@
use puffin_client::File;
use std::ops::Deref;
use puffin_package::pypi_types::File;
/// A distribution can either be a wheel or a source distribution.
#[derive(Debug, Clone)]
pub(crate) struct WheelFile(File);

2
crates/puffin-resolver/src/resolution.rs
View file

@ -9,8 +9,8 @@ use pubgrub::type_aliases::SelectedDependencies;
use pep440_rs::{Version, VersionSpecifier, VersionSpecifiers};
use pep508_rs::{Requirement, VersionOrUrl};
use puffin_client::File;
use puffin_package::package_name::PackageName;
use puffin_package::pypi_types::File;
use crate::pubgrub::{PubGrubPackage, PubGrubPriority, PubGrubVersion};

4
crates/puffin-resolver/src/resolver.rs
View file

@ -20,10 +20,10 @@ use waitmap::WaitMap;
use distribution_filename::{SourceDistributionFilename, WheelFilename};
use pep508_rs::{MarkerEnvironment, Requirement};
use platform_tags::Tags;
use puffin_client::{File, RegistryClient, SimpleJson};
use puffin_client::RegistryClient;
use puffin_package::dist_info_name::DistInfoName;
use puffin_package::metadata::Metadata21;
use puffin_package::package_name::PackageName;
use puffin_package::pypi_types::{File, Metadata21, SimpleJson};
use puffin_traits::BuildContext;
use crate::candidate_selector::CandidateSelector;

4
crates/puffin-resolver/src/source_distribution.rs
View file

@ -13,9 +13,9 @@ use zip::ZipArchive;
use distribution_filename::WheelFilename;
use pep440_rs::Version;
use platform_tags::Tags;
use puffin_client::{File, RegistryClient};
use puffin_package::metadata::Metadata21;
use puffin_client::RegistryClient;
use puffin_package::package_name::PackageName;
use puffin_package::pypi_types::{File, Metadata21};
use puffin_traits::BuildContext;
const BUILT_WHEELS_CACHE: &str = "built-wheels-v0";

4
crates/puffin-resolver/src/wheel_finder.rs
View file

@ -14,9 +14,9 @@ use tracing::debug;
use distribution_filename::WheelFilename;
use pep508_rs::Requirement;
use platform_tags::Tags;
use puffin_client::{File, RegistryClient, SimpleJson};
use puffin_package::metadata::Metadata21;
use puffin_client::RegistryClient;
use puffin_package::package_name::PackageName;
use puffin_package::pypi_types::{File, Metadata21, SimpleJson};
use crate::error::ResolveError;
use crate::resolution::{PinnedPackage, Resolution};