mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-13 09:12:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow yanked versions when specified via == (#561)

Browse source 
## Summary

This enables users to rely on yanked versions via explicit `==` markers,
which is necessary in some projects (and, in my opinion, reasonable).

Closes #551.
This commit is contained in:
Charlie Marsh 2023-12-05 03:44:06 -05:00 • committed by GitHub
parent c3a917bbf6
commit 2d1e19e474
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 178 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/puffin-resolver/src/version_map.rs
View file

@ -15,6 +15,7 @@ use pypi_types::{SimpleJson, Yanked};
use crate::file::{DistFile, SdistFile, WheelFile};
use crate::pubgrub::PubGrubVersion;
use crate::yanks::AllowedYanks;
/// A map from versions to distributions.
#[derive(Debug, Default)]
@ -28,6 +29,7 @@ impl VersionMap {
tags: &Tags,
markers: &MarkerEnvironment,
interpreter: &Interpreter,
allowed_yanks: &AllowedYanks,
exclude_newer: Option<&DateTime<Utc>>,
) -> Self {
let mut version_map: BTreeMap<PubGrubVersion, PrioritizedDistribution> =
@ -72,14 +74,16 @@ impl VersionMap {
}
}
// When resolving, exclude yanked files.
// TODO(konstin): When we fail resolving due to a dependency locked to yanked version,
// we should tell the user.
if file.yanked.as_ref().is_some_and(Yanked::is_yanked) {
continue;
}
if let Ok(filename) = WheelFilename::from_str(file.filename.as_str()) {
// When resolving, exclude yanked files.
if file.yanked.as_ref().is_some_and(Yanked::is_yanked) {
if allowed_yanks.allowed(package_name, &filename.version) {
warn!("Allowing yanked version: {}", file.filename);
} else {
continue;
}
}
let priority = filename.compatibility(tags);
match version_map.entry(filename.version.into()) {
@ -96,6 +100,15 @@ impl VersionMap {
} else if let Ok(filename) =
SourceDistFilename::parse(file.filename.as_str(), package_name)
{
// When resolving, exclude yanked files.
if file.yanked.as_ref().is_some_and(Yanked::is_yanked) {
if allowed_yanks.allowed(package_name, &filename.version) {
warn!("Allowing yanked version: {}", file.filename);
} else {
continue;
}
}
match version_map.entry(filename.version.into()) {
Entry::Occupied(mut entry) => {
entry.get_mut().insert_source(SdistFile(file));