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

Lock all packages in workspace (#4016)

Browse source 
When creating a lockfile, lock the combined dependencies for all
packages in a workspace. This make the lockfile independent of where you
are in the workspace.

Fixes #3983
This commit is contained in:
konsti 2024-06-06 21:09:44 +02:00 • committed by GitHub
parent e9fc99e622
commit a6f53e2aa4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 239 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/uv-resolver/src/pubgrub/dependencies.rs
View file

@ -4,12 +4,13 @@ use either::Either;
use itertools::Itertools;
use pubgrub::range::Range;
use rustc_hash::FxHashSet;
use same_file::is_same_file;
use tracing::warn;
use distribution_types::Verbatim;
use pep440_rs::Version;
use pep508_rs::MarkerEnvironment;
use pypi_types::{Requirement, RequirementSource};
use pypi_types::{ParsedUrl, Requirement, RequirementSource, VerbatimParsedUrl};
use uv_configuration::{Constraints, Overrides};
use uv_git::GitResolver;
use uv_normalize::{ExtraName, GroupName, PackageName};
@ -308,7 +309,7 @@ impl PubGrubRequirement {
version: Range::full(),
})
}
RequirementSource::Path { url, .. } => {
RequirementSource::Path { url, path, .. } => {
let Some(expected) = urls.get(&requirement.name) else {
return Err(ResolveError::DisallowedUrl(
requirement.name.clone(),
@ -316,7 +317,22 @@ impl PubGrubRequirement {
));
};
if !Urls::is_allowed(&expected.verbatim, url, git) {
let mut is_allowed = Urls::is_allowed(&expected.verbatim, url, git);
if !is_allowed {
if let VerbatimParsedUrl {
parsed_url: ParsedUrl::Path(previous_path),
..
} = &expected
{
// On Windows, we can have two versions of the same path, e.g.
// `C:\Users\KONSTA~1` and `C:\Users\Konstantin`.
if is_same_file(path, &previous_path.path).unwrap_or(false) {
is_allowed = true;
}
}
}
if !is_allowed {
return Err(ResolveError::ConflictingUrlsTransitive(
requirement.name.clone(),
expected.verbatim.verbatim().to_string(),

13
crates/uv-resolver/src/resolver/urls.rs
View file

@ -1,4 +1,5 @@
use rustc_hash::FxHashMap;
use same_file::is_same_file;
use tracing::debug;
use url::Url;
@ -66,6 +67,18 @@ impl Urls {
verbatim: url.clone(),
};
if let Some(previous) = urls.insert(requirement.name.clone(), url.clone()) {
if let VerbatimParsedUrl {
parsed_url: ParsedUrl::Path(previous_path),
..
} = &previous
{
// On Windows, we can have two versions of the same path, e.g.
// `C:\Users\KONSTA~1` and `C:\Users\Konstantin`.
if is_same_file(path, &previous_path.path).unwrap_or(false) {
continue;
}
}
if !is_equal(&previous.verbatim, &url.verbatim) {
return Err(ResolveError::ConflictingUrlsDirect(
requirement.name.clone(),