Skip to content

Respect --with versions over base environment versions #14863

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
charliermarsh merged 1 commit into from
Jul 24, 2025
Merged

Respect --with versions over base environment versions #14863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/uv/src/commands/project/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,8 @@ hint: If you are running a script with `{}` in the shebang, you may need to incl

ephemeral_env.set_overlay(format!(
"import site; site.addsitedir(\"{}\"); site.addsitedir(\"{}\");",
base_site_packages.escape_for_python(),
requirements_site_packages.escape_for_python(),
base_site_packages.escape_for_python(),
))?;
Copy link
Member Author

@charliermarsh charliermarsh Jul 24, 2025

Choose a reason for hiding this comment

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

TIL that earlier addsitedir calls get priority over later.


// N.B. The order here matters — earlier interpreters take precedence over the
Expand Down
27 changes: 17 additions & 10 deletions crates/uv/tests/it/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,14 +1167,17 @@ fn run_with() -> Result<()> {
let test_script = context.temp_dir.child("main.py");
test_script.write_str(indoc! { r"
import sniffio

print(sniffio.__version__)
"
})?;

// Requesting an unsatisfied requirement should install it.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("iniconfig").arg("main.py"), @r###"
uv_snapshot!(context.filters(), context.run().arg("--with").arg("iniconfig").arg("main.py"), @r"
success: true
exit_code: 0
----- stdout -----
1.3.0

----- stderr -----
Resolved 2 packages in [TIME]
Expand All @@ -1186,24 +1189,26 @@ fn run_with() -> Result<()> {
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
");

// Requesting a satisfied requirement should use the base environment.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("sniffio").arg("main.py"), @r###"
uv_snapshot!(context.filters(), context.run().arg("--with").arg("sniffio").arg("main.py"), @r"
success: true
exit_code: 0
----- stdout -----
1.3.0

----- stderr -----
Resolved 2 packages in [TIME]
Audited 2 packages in [TIME]
"###);
");

// Unless the user requests a different version.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("sniffio<1.3.0").arg("main.py"), @r###"
uv_snapshot!(context.filters(), context.run().arg("--with").arg("sniffio<1.3.0").arg("main.py"), @r"
success: true
exit_code: 0
----- stdout -----
1.2.0

----- stderr -----
Resolved 2 packages in [TIME]
Expand All @@ -1212,15 +1217,16 @@ fn run_with() -> Result<()> {
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ sniffio==1.2.0
"###);
");

// If we request a dependency that isn't in the base environment, we should still respect any
// other dependencies. In this case, `sniffio==1.3.0` is not the latest-compatible version, but
// we should use it anyway.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("anyio").arg("main.py"), @r###"
uv_snapshot!(context.filters(), context.run().arg("--with").arg("anyio").arg("main.py"), @r"
success: true
exit_code: 0
----- stdout -----
1.3.0

----- stderr -----
Resolved 2 packages in [TIME]
Expand All @@ -1231,13 +1237,14 @@ fn run_with() -> Result<()> {
+ anyio==4.3.0
+ idna==3.6
+ sniffio==1.3.0
"###);
");

// Even if we run with` --no-sync`.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("anyio==4.2.0").arg("--no-sync").arg("main.py"), @r###"
uv_snapshot!(context.filters(), context.run().arg("--with").arg("anyio==4.2.0").arg("--no-sync").arg("main.py"), @r"
success: true
exit_code: 0
----- stdout -----
1.3.0

----- stderr -----
Resolved 3 packages in [TIME]
Expand All @@ -1246,7 +1253,7 @@ fn run_with() -> Result<()> {
+ anyio==4.2.0
+ idna==3.6
+ sniffio==1.3.0
"###);
");

// If the dependencies can't be resolved, we should reference `--with`.
uv_snapshot!(context.filters(), context.run().arg("--with").arg("add").arg("main.py"), @r###"
Expand Down
Loading