Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 21 additions & 7 deletions crates/uv/src/commands/project/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use uv_distribution::{ArchiveMetadata, Metadata};
use uv_distribution_types::Identifier;
use uv_normalize::PackageName;
use uv_pep440::{Operator, VersionSpecifier, VersionSpecifiers};
use uv_pep508::{Requirement, VerbatimUrl, VersionOrUrl};
use uv_pep508::{MarkerTree, Requirement, VerbatimUrl, VersionOrUrl};
use uv_preview::Preview;
use uv_pypi_types::{PyProjectToml, ResolutionMetadata, VerbatimParsedUrl};
use uv_python::{PythonDownloads, PythonPreference};
Expand Down Expand Up @@ -112,14 +112,19 @@ pub(crate) async fn upgrade(
.and_then(|uv| uv.sources.as_ref())
.and_then(|sources| sources.inner().get(&package))
.or_else(|| project.workspace().sources().get(&package));
let extra = requirement.marker.top_level_extra_name();
if sources.is_some_and(|sources| {
sources.iter().any(|source| {
source
.extra()
.is_none_or(|target| extra.as_deref() == Some(target))
&& source.group().is_none()
&& !source.marker().is_disjoint(requirement.marker)
source_is_applicable(source, requirement.marker)
&& matches!(source, Source::Git { rev: Some(_), .. })
})
}) {
bail!(
"Dependency `{package}` is pinned to a Git revision and cannot be upgraded commit-to-commit"
);
}
if sources.is_some_and(|sources| {
sources.iter().any(|source| {
source_is_applicable(source, requirement.marker)
&& !matches!(source, Source::Registry { .. })
})
}) {
Expand Down Expand Up @@ -270,6 +275,15 @@ pub(crate) async fn upgrade(
Ok(ExitStatus::Success)
}

fn source_is_applicable(source: &Source, requirement_marker: MarkerTree) -> bool {
let extra = requirement_marker.top_level_extra_name();
source
.extra()
.is_none_or(|target| extra.as_deref() == Some(target))
&& source.group().is_none()
&& !source.marker().is_disjoint(requirement_marker)
}

fn relax_requirement(
requirement: &Requirement<VerbatimParsedUrl>,
) -> Requirement<VerbatimParsedUrl> {
Expand Down
33 changes: 33 additions & 0 deletions crates/uv/tests/it/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,39 @@ fn upgrade_rejects_self_dependency() -> Result<()> {
assert_project_unchanged(&context, pyproject_toml)
}

#[test]
fn upgrade_rejects_git_revision() -> Result<()> {
let context = uv_test::test_context_with_versions!(&[]);
let pyproject_toml = r#"
[project]
name = "example"
version = "0.1.0"
dependencies = ["requests>=2"]

[tool.uv.sources]
requests = { git = "https://github.com/psf/requests", rev = "6f205ff422bccd5e4c4fc0b64c5f3e7df5181db6" }
"#;
context
.temp_dir
.child("pyproject.toml")
.write_str(pyproject_toml)?;

uv_snapshot!(
context.filters(),
context.upgrade().arg("requests"),
@"
success: false
exit_code: 2
----- stdout -----

----- stderr -----
error: Dependency `requests` is pinned to a Git revision and cannot be upgraded commit-to-commit
"
);

assert_project_unchanged(&context, pyproject_toml)
}

#[test]
fn upgrade_rejects_non_registry_sources() -> Result<()> {
let context = uv_test::test_context_with_versions!(&[]);
Expand Down
Loading