Skip to content

Prevent concurrent updates of the environment in uv run #14153

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
oconnor663 merged 2 commits into from
Jun 20, 2025
Merged

Prevent concurrent updates of the environment in uv run #14153

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f832d15
(f)lock during `uv run`
oconnor663 Jun 19, 2025
661cdf1
move one lock acquisition down a bit
oconnor663 Jun 20, 2025
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
6 changes: 6 additions & 0 deletions crates/uv/src/commands/project/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
.await?
.into_environment()?;

let _lock = environment.lock().await?;

// Determine the lock mode.
let mode = if frozen {
LockMode::Frozen
Expand Down Expand Up @@ -363,6 +365,8 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
.await?
.into_environment()?;

let _lock = environment.lock().await?;
Copy link
Member

@konstin konstin Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we can more one statement later, just before update_environment


let build_constraints = script
.metadata()
.tool
Expand Down Expand Up @@ -685,6 +689,8 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl
.map(|lock| (lock, project.workspace().install_path().to_owned()));
}
} else {
let _lock = venv.lock().await?;

// Determine the lock mode.
let mode = if frozen {
LockMode::Frozen
Expand Down
Loading