Skip to content

Commit dc5b376

Browse files
Show tag hints when failing to find a compatible wheel in pylock.toml (astral-sh#13136)
## Summary Closes astral-sh#13135.
1 parent 78756de commit dc5b376

File tree

6 files changed

+294
-184
lines changed

6 files changed

+294
-184
lines changed

crates/uv-requirements/src/upgrade.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use uv_configuration::Upgrade;
77
use uv_fs::CWD;
88
use uv_git::ResolvedRepositoryReference;
99
use uv_requirements_txt::RequirementsTxt;
10-
use uv_resolver::{Lock, LockError, Preference, PreferenceError, PylockToml, PylockTomlError};
10+
use uv_resolver::{Lock, LockError, Preference, PreferenceError, PylockToml, PylockTomlErrorKind};
1111

1212
#[derive(Debug, Default)]
1313
pub struct LockedRequirements {
@@ -105,7 +105,7 @@ pub fn read_lock_requirements(
105105
pub async fn read_pylock_toml_requirements(
106106
output_file: &Path,
107107
upgrade: &Upgrade,
108-
) -> Result<LockedRequirements, PylockTomlError> {
108+
) -> Result<LockedRequirements, PylockTomlErrorKind> {
109109
// As an optimization, skip iterating over the lockfile is we're upgrading all packages anyway.
110110
if upgrade.is_all() {
111111
return Ok(LockedRequirements::default());

crates/uv-resolver/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ pub use exclusions::Exclusions;
55
pub use flat_index::{FlatDistributions, FlatIndex};
66
pub use fork_strategy::ForkStrategy;
77
pub use lock::{
8-
Installable, Lock, LockError, LockVersion, Package, PackageMap, PylockToml, PylockTomlError,
9-
RequirementsTxtExport, ResolverManifest, SatisfiesResult, TreeDisplay, VERSION,
8+
Installable, Lock, LockError, LockVersion, Package, PackageMap, PylockToml,
9+
PylockTomlErrorKind, RequirementsTxtExport, ResolverManifest, SatisfiesResult, TreeDisplay,
10+
VERSION,
1011
};
1112
pub use manifest::Manifest;
1213
pub use options::{Flexibility, Options, OptionsBuilder};

crates/uv-resolver/src/lock/export/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use uv_pypi_types::ConflictItem;
1515

1616
use crate::graph_ops::{marker_reachability, Reachable};
1717
pub(crate) use crate::lock::export::pylock_toml::PylockTomlPackage;
18-
pub use crate::lock::export::pylock_toml::{PylockToml, PylockTomlError};
18+
pub use crate::lock::export::pylock_toml::{PylockToml, PylockTomlErrorKind};
1919
pub use crate::lock::export::requirements_txt::RequirementsTxtExport;
2020
use crate::universal_marker::resolve_conflicts;
2121
use crate::{Installable, Package};

0 commit comments

Comments
 (0)