mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-07-07 21:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Normalize fork markers (#4623)

Browse source 
Looks much better than #4618:

```
DEBUG Pre-fork split universal took 0.644s
DEBUG Split python_version >= '3.12' and platform_machine == 'aarch64' and platform_system == 'Darwin' and platform_system == 'Linux' took 0.659s
DEBUG Split python_version == '3.9' and platform_machine == 'arm64' and platform_system == 'Darwin' took 0.291s
```
This commit is contained in:
konsti 2024-06-28 17:55:48 +02:00 • committed by GitHub
parent 3a62ba3809
commit 796171e1e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/uv-resolver/src/resolver/mod.rs
View file

@ -43,6 +43,7 @@ use crate::dependency_provider::UvDependencyProvider;
use crate::error::ResolveError; use crate::error::ResolveError;
use crate::fork_urls::ForkUrls; use crate::fork_urls::ForkUrls;
use crate::manifest::Manifest; use crate::manifest::Manifest;
use crate::marker::normalize;
use crate::pins::FilePins; use crate::pins::FilePins;
use crate::preferences::Preferences; use crate::preferences::Preferences;
use crate::pubgrub::{ use crate::pubgrub::{
@ -548,6 +549,8 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
cur_state = Some(forked_state.clone()); cur_state = Some(forked_state.clone());
} }
forked_state.markers.and(fork.markers); forked_state.markers.and(fork.markers);
forked_state.markers = normalize(forked_state.markers)
.unwrap_or(MarkerTree::And(Vec::new()));
forked_state.add_package_version_dependencies( forked_state.add_package_version_dependencies(
for_package.as_deref(), for_package.as_deref(),
@ -1719,14 +1722,7 @@ impl SolveState {
} }
if let Some(for_package) = for_package { if let Some(for_package) = for_package {
if self.markers == MarkerTree::And(Vec::new()) { debug!("Adding transitive dependency for {for_package}: {package}{version}");
debug!("Adding transitive dependency for {for_package}: {package}{version}",);
} else {
debug!(
"Adding transitive dependency for {for_package}{{{}}}: {package}{version}",
self.markers
);
}
} else { } else {
// A dependency from the root package or requirements.txt. // A dependency from the root package or requirements.txt.
debug!("Adding direct dependency: {package}{version}"); debug!("Adding direct dependency: {package}{version}");