uv-resolver: remove the conservative checking of unconditional extras

This removes the error that was causing folks problems.

This does result in some snapshot updates that are arguably wrong, or at
least sub-optimal. However, it's actually intended. Because the approach
we're going to take is going to permit the creation of uninstallable
lock files as a side effect. In the future, we will modify this test to
check that, while `uv lock` succeeds, `uv sync` will always fail.
This commit is contained in:
Andrew Gallant
2025-01-22 13:36:14 -05:00
committed by Andrew Gallant
parent 183fe403c6
commit ae9c5c849d
3 changed files with 10 additions and 57 deletions
+1 -8
View File
@@ -12,7 +12,7 @@ use tracing::trace;
use uv_distribution_types::{
DerivationChain, DistErrorKind, IndexCapabilities, IndexLocations, IndexUrl, RequestedDist,
};
use uv_normalize::{ExtraName, PackageName};
use uv_normalize::PackageName;
use uv_pep440::{LocalVersionSlice, Version};
use uv_platform_tags::Tags;
use uv_static::EnvVars;
@@ -48,13 +48,6 @@ pub enum ResolveError {
#[error("Attempted to wait on an unregistered task: `{_0}`")]
UnregisteredTask(String),
#[error("Found conflicting extra `{extra}` unconditionally enabled in `{requirement}`")]
ConflictingExtra {
// Boxed because `Requirement` is large.
requirement: Box<uv_pypi_types::Requirement>,
extra: ExtraName,
},
#[error(
"Requirements contain conflicting URLs for package `{package_name}`{}:\n- {}",
if env.marker_environment().is_some() {