mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename DistInfoMetadata to CoreMetadata (#3699)

Browse source 
## Summary

This reflects the change codified in PEP 714.
This commit is contained in:
Charlie Marsh 2024-05-21 14:26:59 -04:00 • committed by GitHub
parent fee344db6f
commit cf997080b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/distribution-types/src/file.rs
View file

@ -7,7 +7,7 @@ use url::Url;
use pep440_rs::{VersionSpecifiers, VersionSpecifiersParseError}; use pep440_rs::{VersionSpecifiers, VersionSpecifiersParseError};
use pep508_rs::split_scheme; use pep508_rs::split_scheme;
use pypi_types::{DistInfoMetadata, HashDigest, Yanked}; use pypi_types::{CoreMetadata, HashDigest, Yanked};
/// Error converting [`pypi_types::File`] to [`distribution_type::File`]. /// Error converting [`pypi_types::File`] to [`distribution_type::File`].
#[derive(Debug, Error)] #[derive(Debug, Error)]
@ -48,7 +48,7 @@ impl File {
.as_ref() .as_ref()
.or(file.dist_info_metadata.as_ref()) .or(file.dist_info_metadata.as_ref())
.or(file.data_dist_info_metadata.as_ref()) .or(file.data_dist_info_metadata.as_ref())
.is_some_and(DistInfoMetadata::is_available), .is_some_and(CoreMetadata::is_available),
filename: file.filename, filename: file.filename,
hashes: file.hashes.into_digests(), hashes: file.hashes.into_digests(),
requires_python: file requires_python: file

10
crates/pypi-types/src/simple_json.rs
View file

@ -39,9 +39,9 @@ fn sorted_simple_json_files<'de, D: Deserializer<'de>>(d: D) -> Result<Vec<File>
pub struct File { pub struct File {
// PEP 714-renamed field, followed by PEP 691-compliant field, followed by non-PEP 691-compliant // PEP 714-renamed field, followed by PEP 691-compliant field, followed by non-PEP 691-compliant
// alias used by PyPI. // alias used by PyPI.
pub core_metadata: Option<DistInfoMetadata>, pub core_metadata: Option<CoreMetadata>,
pub dist_info_metadata: Option<DistInfoMetadata>, pub dist_info_metadata: Option<CoreMetadata>,
pub data_dist_info_metadata: Option<DistInfoMetadata>, pub data_dist_info_metadata: Option<CoreMetadata>,
pub filename: String, pub filename: String,
pub hashes: Hashes, pub hashes: Hashes,
/// There are a number of invalid specifiers on PyPI, so we first try to parse it into a /// There are a number of invalid specifiers on PyPI, so we first try to parse it into a
@ -73,12 +73,12 @@ where
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
#[serde(untagged)] #[serde(untagged)]
pub enum DistInfoMetadata { pub enum CoreMetadata {
Bool(bool), Bool(bool),
Hashes(Hashes), Hashes(Hashes),
} }
impl DistInfoMetadata { impl CoreMetadata {
pub fn is_available(&self) -> bool { pub fn is_available(&self) -> bool {
match self { match self {
Self::Bool(is_available) => *is_available, Self::Bool(is_available) => *is_available,

8
crates/uv-client/src/html.rs
View file

@ -6,7 +6,7 @@ use url::Url;
use pep440_rs::VersionSpecifiers; use pep440_rs::VersionSpecifiers;
use pypi_types::LenientVersionSpecifiers; use pypi_types::LenientVersionSpecifiers;
use pypi_types::{BaseUrl, DistInfoMetadata, File, Hashes, Yanked}; use pypi_types::{BaseUrl, CoreMetadata, File, Hashes, Yanked};
/// A parsed structure from PyPI "HTML" index format for a single package. /// A parsed structure from PyPI "HTML" index format for a single package.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -197,9 +197,9 @@ impl SimpleHtml {
let dist_info_metadata = std::str::from_utf8(dist_info_metadata.as_bytes())?; let dist_info_metadata = std::str::from_utf8(dist_info_metadata.as_bytes())?;
let dist_info_metadata = html_escape::decode_html_entities(dist_info_metadata); let dist_info_metadata = html_escape::decode_html_entities(dist_info_metadata);
match dist_info_metadata.as_ref() { match dist_info_metadata.as_ref() {
"true" => Some(DistInfoMetadata::Bool(true)), "true" => Some(CoreMetadata::Bool(true)),
"false" => Some(DistInfoMetadata::Bool(false)), "false" => Some(CoreMetadata::Bool(false)),
fragment => Some(DistInfoMetadata::Hashes(Self::parse_hash(fragment)?)), fragment => Some(CoreMetadata::Hashes(Self::parse_hash(fragment)?)),
} }
} else { } else {
None None