mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 02:48:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Do not require workspace members to sync with --frozen (#6737)

Browse source 
## Summary

Closes https://github.com/astral-sh/uv/issues/6685.
This commit is contained in:
Charlie Marsh 2024-08-28 07:58:50 -04:00 • committed by GitHub
parent 485e0d2748
commit 53ef633c6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 85 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/uv-configuration/Cargo.toml
View file

@ -20,7 +20,6 @@ pypi-types = { workspace = true }
uv-auth = { workspace = true }
uv-cache = { workspace = true }
uv-normalize = { workspace = true }
uv-workspace = { workspace = true }
clap = { workspace = true, features = ["derive"], optional = true }
either = { workspace = true }

22
crates/uv-configuration/src/install_options.rs
View file

@ -1,9 +1,10 @@
use std::collections::BTreeSet;
use rustc_hash::FxHashSet;
use tracing::debug;
use distribution_types::{Name, Resolution};
use pep508_rs::PackageName;
use uv_workspace::VirtualProject;
#[derive(Debug, Clone, Default)]
pub struct InstallOptions {
@ -28,13 +29,14 @@ impl InstallOptions {
pub fn filter_resolution(
&self,
resolution: Resolution,
project: &VirtualProject,
project_name: Option<&PackageName>,
members: &BTreeSet<PackageName>,
) -> Resolution {
// If `--no-install-project` is set, remove the project itself.
let resolution = self.apply_no_install_project(resolution, project);
let resolution = self.apply_no_install_project(resolution, project_name);
// If `--no-install-workspace` is set, remove the project and any workspace members.
let resolution = self.apply_no_install_workspace(resolution, project);
let resolution = self.apply_no_install_workspace(resolution, members);
// If `--no-install-package` is provided, remove the requested packages.
self.apply_no_install_package(resolution)
@ -43,13 +45,13 @@ impl InstallOptions {
fn apply_no_install_project(
&self,
resolution: Resolution,
project: &VirtualProject,
project_name: Option<&PackageName>,
) -> Resolution {
if !self.no_install_project {
return resolution;
}
let Some(project_name) = project.project_name() else {
let Some(project_name) = project_name else {
debug!("Ignoring `--no-install-project` for virtual workspace");
return resolution;
};
@ -60,17 +62,13 @@ impl InstallOptions {
fn apply_no_install_workspace(
&self,
resolution: Resolution,
project: &VirtualProject,
members: &BTreeSet<PackageName>,
) -> Resolution {
if !self.no_install_workspace {
return resolution;
}
let workspace_packages = project.workspace().packages();
resolution.filter(|dist| {
!workspace_packages.contains_key(dist.name())
&& Some(dist.name()) != project.project_name()
})
resolution.filter(|dist| !members.contains(dist.name()))
}
fn apply_no_install_package(&self, resolution: Resolution) -> Resolution {