Use environment layering for uv run --with
#3447
Conversation
charliermarsh
force-pushed
the
charlie/layer
branch
from
bbf05da
to
db8c09d
Compare
| // Sync the workspace requirements. | ||
| Some(sync_environment(venv, &workspace_requirements, preview, cache, printer).await?) |
There was a problem hiding this comment.
Just throwing this out here to think about... wouldn't it be annoying if we exposed a default environment at .venv and every time you used uv run any manual changes you had made were undone?
There was a problem hiding this comment.
Yeah, though this doesn't uninstall anything, it just makes sure it's in-sync with the (in-the-future) lockfile. Does that seem right?
There was a problem hiding this comment.
Ah we'll need to be careful with "in sync" because sync implies an exact match (no extra packages) to me. Seems ideal not to remove packages unless requested? Like.. uv sync --strict?
There was a problem hiding this comment.
This is in uv run, not uv sync. For now, neither one is removing packages, but I don’t feel strongly about the behavior.
There was a problem hiding this comment.
I understand that, I'm talking more generally.
uv run should not probably not remove extraneous packages (and I understand that is the current behavior).
charliermarsh
force-pushed
the
charlie/layer
branch
3 times, most recently
from
0930363
to
2b1e115
Compare
| iter::once(python_env.scripts().to_path_buf()).chain(env::split_paths(&path)); | ||
| env::join_paths(python_env_path)? | ||
| // If necessary, create an environment for the ephemeral requirements. | ||
| let tmpdir; |
There was a problem hiding this comment.
That's curious, how is that implemented in rust, does this insert a conditional drop?
charliermarsh
force-pushed
the
charlie/sync
branch
from
5da8977
to
f8e9aa7
Compare
charliermarsh
force-pushed
the
charlie/layer
branch
3 times, most recently
from
f236a64
to
9085bba
Compare
charliermarsh
force-pushed
the
charlie/layer
branch
from
9085bba
to
fcb6720
Compare
Summary
This PR takes a different approach to
--withforuv run. Now, instead of merging the requirements and re-resolving, we have two phases: (1) sync the workspace requirements to the workspace environment; then (2) sync the ephemeral--withrequirements to an ephemeral environment. The two environments are then layered by setting thePATHandPYTHONPATHvariables appropriately.I think this approach simplifies a few things:
--with, then it's not really clear how the lockfile would/should behave.The current version of this PR loses a few behaviors though that I need to restore:
--pythonsupport -- but I'm not yet sure how this is supposed to behave within projects? It's also left unclear inuv syncanduv lock.Closes #3411.