Skip to content

Only remove a source from [tool.uv.sources] if it is no long being referenced #8366

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

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Only remove a source from [tool.uv.sources] if it is no long being referenced #8366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1f6ce
Only remove `[tool.uv.sources]` if it is no long being referenced
j178 Oct 19, 2024
7a67f44
Fix snapshot
j178 Oct 19, 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
5 changes: 5 additions & 0 deletions crates/uv-workspace/src/pyproject_mut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,11 @@ impl PyProjectTomlMut {

/// Remove a matching source from `tool.uv.sources`, if it exists.
fn remove_source(&mut self, name: &PackageName) -> Result<(), Error> {
// If the dependency is still in use, don't remove the source.
if !self.find_dependency(name, None).is_empty() {
return Ok(());
}

if let Some(sources) = self
.doc
.get_mut("tool")
Expand Down
26 changes: 14 additions & 12 deletions crates/uv/tests/it/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4584,12 +4584,10 @@ fn remove_repeated() -> Result<()> {
----- stdout -----

----- stderr -----
Resolved 4 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 3 packages in [TIME]
+ anyio==4.3.0
+ idna==3.6
+ sniffio==1.3.1
Resolved 2 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local)
"###);

let pyproject_toml = context.read("pyproject.toml");
Expand All @@ -4610,6 +4608,9 @@ fn remove_repeated() -> Result<()> {

[tool.uv]
dev-dependencies = ["anyio"]

[tool.uv.sources]
anyio = { path = "[WORKSPACE]/scripts/packages/anyio_local" }
"###
);
});
Expand All @@ -4620,8 +4621,8 @@ fn remove_repeated() -> Result<()> {
----- stdout -----

----- stderr -----
Resolved 4 packages in [TIME]
Audited 3 packages in [TIME]
Resolved 2 packages in [TIME]
Audited 1 package in [TIME]
"###);

let pyproject_toml = context.read("pyproject.toml");
Expand All @@ -4642,6 +4643,9 @@ fn remove_repeated() -> Result<()> {

[tool.uv]
dev-dependencies = ["anyio"]

[tool.uv.sources]
anyio = { path = "[WORKSPACE]/scripts/packages/anyio_local" }
"###
);
});
Expand All @@ -4653,10 +4657,8 @@ fn remove_repeated() -> Result<()> {

----- stderr -----
Resolved 1 package in [TIME]
Uninstalled 3 packages in [TIME]
- anyio==4.3.0
- idna==3.6
- sniffio==1.3.1
Uninstalled 1 package in [TIME]
- anyio==4.3.0+foo (from file://[WORKSPACE]/scripts/packages/anyio_local)
"###);

let pyproject_toml = context.read("pyproject.toml");
Expand Down
Loading