Skip to content

Sort extras and groups when comparing lockfile requirements #10856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Jan 22, 2025
Merged

Sort extras and groups when comparing lockfile requirements #10856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions crates/uv-resolver/src/lock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use petgraph::visit::EdgeRef;
use rustc_hash::{FxHashMap, FxHashSet};
use serde::Serializer;
use toml_edit::{value, Array, ArrayOfTables, InlineTable, Item, Table, Value};
use tracing::trace;
use tracing::debug;
use url::Url;

use uv_cache_key::RepositoryUrl;
Expand Down Expand Up @@ -1310,15 +1310,15 @@ impl Lock {
let satisfied = metadata.is_some_and(|metadata| {
match satisfies_requires_dist(metadata, package, root) {
Ok(SatisfiesResult::Satisfied) => {
trace!("Static `Requires-Dist` for `{}` is up-to-date", package.id);
debug!("Static `requires-dist` for `{}` is up-to-date", package.id);
true
},
Ok(..) => {
trace!("Static `Requires-Dist` for `{}` is out-of-date; falling back to distribution database", package.id);
debug!("Static `requires-dist` for `{}` is out-of-date; falling back to distribution database", package.id);
false
},
Err(..) => {
trace!("Static `Requires-Dist` for `{}` is invalid; falling back to distribution database", package.id);
debug!("Static `requires-dist` for `{}` is invalid; falling back to distribution database", package.id);
false
},
}
Expand Down Expand Up @@ -4131,7 +4131,15 @@ fn normalize_url(mut url: Url) -> UrlString {
/// 2. Ensures that the lock and install paths are appropriately framed with respect to the
/// current [`Workspace`].
/// 3. Removes the `origin` field, which is only used in `requirements.txt`.
fn normalize_requirement(requirement: Requirement, root: &Path) -> Result<Requirement, LockError> {
fn normalize_requirement(
mut requirement: Requirement,
root: &Path,
) -> Result<Requirement, LockError> {
// Sort the extras and groups for consistency.
requirement.extras.sort();
requirement.groups.sort();

// Normalize the requirement source.
match requirement.source {
RequirementSource::Git {
mut repository,
Expand Down
1 change: 1 addition & 0 deletions crates/uv/tests/it/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15078,6 +15078,7 @@ fn lock_explicit_default_index() -> Result<()> {
DEBUG Using request timeout of [TIME]
DEBUG Found static `requires-dist` for: [TEMP_DIR]/
DEBUG No workspace root found, using project root
DEBUG Static `requires-dist` for `project==0.1.0 @ editable+.` is out-of-date; falling back to distribution database
DEBUG Found static `pyproject.toml` for: project @ file://[TEMP_DIR]/
DEBUG No workspace root found, using project root
DEBUG Ignoring existing lockfile due to mismatched requirements for: `project==0.1.0`
Expand Down