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

Represent build tag as u64 (#4253)

Browse source 
## Summary

The build tags in this case are like, e.g., `202206090410`. That's
larger than a `u32`, so we're rejecting the wheel. In theory build tags
could be even larger, but we already use `u64` for version segment so I
think it's fine to keep that constraint here.

I'm going to look into surfacing these errors separately.

Closes https://github.com/astral-sh/uv/issues/4252.

## Test Plan

`cargo run pip install monailabel`
This commit is contained in:
Charlie Marsh 2024-06-11 14:40:08 -07:00 • committed by GitHub
parent 6dae1920af
commit 44592681a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/distribution-filename/src/build_tag.rs
View file

@ -34,7 +34,7 @@ pub enum BuildTagError {
)] )]
#[archive(check_bytes)] #[archive(check_bytes)]
#[archive_attr(derive(Debug))] #[archive_attr(derive(Debug))]
pub struct BuildTag(u32, Option<Arc<str>>); pub struct BuildTag(u64, Option<Arc<str>>);
impl FromStr for BuildTag { impl FromStr for BuildTag {
type Err = BuildTagError; type Err = BuildTagError;
@ -58,6 +58,6 @@ impl FromStr for BuildTag {
None => (s, None), None => (s, None),
}; };
Ok(BuildTag(prefix.parse::<u32>()?, suffix.map(Arc::from))) Ok(BuildTag(prefix.parse::<u64>()?, suffix.map(Arc::from)))
} }
} }

4
crates/distribution-filename/src/snapshots/distribution_filename__wheel__tests__ok_build_tag.snap
View file

@ -1,6 +1,6 @@
--- ---
source: crates/distribution-filename/src/wheel.rs source: crates/distribution-filename/src/wheel.rs
expression: "WheelFilename::from_str(\"foo-1.2.3-12-python-abi-platform.whl\")" expression: "WheelFilename::from_str(\"foo-1.2.3-202206090410-python-abi-platform.whl\")"
--- ---
Ok( Ok(
WheelFilename { WheelFilename {
@ -10,7 +10,7 @@ Ok(
version: "1.2.3", version: "1.2.3",
build_tag: Some( build_tag: Some(
BuildTag( BuildTag(
12, 202206090410,
None, None,
), ),
), ),

2
crates/distribution-filename/src/wheel.rs
View file

@ -314,7 +314,7 @@ mod tests {
#[test] #[test]
fn ok_build_tag() { fn ok_build_tag() {
insta::assert_debug_snapshot!(WheelFilename::from_str( insta::assert_debug_snapshot!(WheelFilename::from_str(
"foo-1.2.3-12-python-abi-platform.whl" "foo-1.2.3-202206090410-python-abi-platform.whl"
)); ));
} }

2
crates/uv-cache/src/lib.rs
View file

@ -644,7 +644,7 @@ impl CacheBucket {
Self::FlatIndex => "flat-index-v0", Self::FlatIndex => "flat-index-v0",
Self::Git => "git-v0", Self::Git => "git-v0",
Self::Interpreter => "interpreter-v2", Self::Interpreter => "interpreter-v2",
Self::Simple => "simple-v8", Self::Simple => "simple-v9",
Self::Wheels => "wheels-v1", Self::Wheels => "wheels-v1",
Self::Archive => "archive-v0", Self::Archive => "archive-v0",
Self::Environments => "environments-v0", Self::Environments => "environments-v0",