Skip to content
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

Jump to bottom

Gracefully handle virtual environments with conflicting packages #1893

Merged
merged 3 commits into from
Feb 23, 2024
Merged

Gracefully handle virtual environments with conflicting packages #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a55e19
Ignore duplicates
charliermarsh Feb 22, 2024
697ec54
Hmm...
charliermarsh Feb 22, 2024
7531eda
Dupes
charliermarsh Feb 23, 2024
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
2 changes: 1 addition & 1 deletion crates/distribution-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl std::fmt::Display for VersionOrUrl<'_> {
}
}

#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub enum InstalledVersion<'a> {
/// A PEP 440 version specifier, used to identify a distribution in a registry.
Version(&'a Version),
Expand Down
76 changes: 41 additions & 35 deletions crates/uv-installer/src/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,23 @@ impl<'a> Planner<'a> {
warn!("Editable requirement is not editable: {installed}");
continue;
};
if site_packages.remove_editable(editable).is_none() {
let existing = site_packages.remove_editables(editable);
if existing.is_empty() {
warn!("Editable requirement is not installed: {installed}");
continue;
}
}
ResolvedEditable::Built(built) => {
debug!("Treating editable requirement as mutable: {built}");

if let Some(dist) = site_packages.remove_editable(built.editable.raw()) {
// Remove any editable installs.
reinstalls.push(dist);
} else if let Some(dist) = site_packages.remove(built.name()) {
// Remove any non-editable installs of the same package.
reinstalls.push(dist);
}
// Remove any editable installs.
let existing = site_packages.remove_editables(built.editable.raw());
reinstalls.extend(existing);

// Remove any non-editable installs of the same package.
let existing = site_packages.remove_packages(built.name());
reinstalls.extend(existing);

local.push(built.wheel.clone());
}
}
Expand Down Expand Up @@ -165,42 +167,46 @@ impl<'a> Planner<'a> {
};

if reinstall {
if let Some(distribution) = site_packages.remove(&requirement.name) {
reinstalls.push(distribution);
}
let installed = site_packages.remove_packages(&requirement.name);
reinstalls.extend(installed);
} else {
if let Some(distribution) = site_packages.remove(&requirement.name) {
// Filter out already-installed packages.
match requirement.version_or_url.as_ref() {
// If the requirement comes from a registry, check by name.
None | Some(VersionOrUrl::VersionSpecifier(_)) => {
if requirement.is_satisfied_by(distribution.version()) {
debug!("Requirement already satisfied: {distribution}");
continue;
let installed = site_packages.remove_packages(&requirement.name);
match installed.as_slice() {
[] => {}
[distribution] => {
// Filter out already-installed packages.
match requirement.version_or_url.as_ref() {
// If the requirement comes from a registry, check by name.
None | Some(VersionOrUrl::VersionSpecifier(_)) => {
if requirement.is_satisfied_by(distribution.version()) {
debug!("Requirement already satisfied: {distribution}");
continue;
}
}
}

// If the requirement comes from a direct URL, check by URL.
Some(VersionOrUrl::Url(url)) => {
if let InstalledDist::Url(distribution) = &distribution {
if &distribution.url == url.raw() {
// If the requirement came from a local path, check freshness.
if let Ok(archive) = url.to_file_path() {
if not_modified_install(distribution, &archive)? {
debug!("Requirement already satisfied (and up-to-date): {distribution}");
// If the requirement comes from a direct URL, check by URL.
Some(VersionOrUrl::Url(url)) => {
if let InstalledDist::Url(distribution) = &distribution {
if &distribution.url == url.raw() {
// If the requirement came from a local path, check freshness.
if let Ok(archive) = url.to_file_path() {
if not_modified_install(distribution, &archive)? {
debug!("Requirement already satisfied (and up-to-date): {distribution}");
continue;
}
} else {
// Otherwise, assume the requirement is up-to-date.
debug!("Requirement already satisfied (assumed up-to-date): {distribution}");
continue;
}
} else {
// Otherwise, assume the requirement is up-to-date.
debug!("Requirement already satisfied (assumed up-to-date): {distribution}");
continue;
}
}
}
}
}

reinstalls.push(distribution);
reinstalls.push(distribution.clone());
}
_ => reinstalls.extend(installed),
}
}

Expand Down Expand Up @@ -375,7 +381,7 @@ impl<'a> Planner<'a> {
}

// Remove any unnecessary packages.
if !site_packages.is_empty() {
if site_packages.any() {
// If uv created the virtual environment, then remove all packages, regardless of
// whether they're considered "seed" packages.
let seed_packages = !venv.cfg().is_ok_and(|cfg| cfg.is_uv());
Expand Down
Loading