From 075893b1400739416c0033acb3854b0bdbb7290f Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 7 Jan 2025 02:41:02 +0200 Subject: [PATCH] Still do conda run for `uv` (#218) --- unidep/_cli.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/unidep/_cli.py b/unidep/_cli.py index a44ec8d7..52532efd 100755 --- a/unidep/_cli.py +++ b/unidep/_cli.py @@ -860,7 +860,14 @@ def _pip_install_local( flags: list[str] | None = None, ) -> None: # pragma: no cover if _use_uv(no_uv): - pip_command = ["uv", "pip", "install", "--python", python_executable] + pip_command = [ + *conda_run, + "uv", + "pip", + "install", + "--python", + python_executable, + ] else: pip_command = [*conda_run, python_executable, "-m", "pip", "install"] @@ -975,8 +982,10 @@ def _install_command( # noqa: PLR0912, PLR0915 conda_env_prefix, ) if env_spec.pip and not skip_pip: + conda_run = _maybe_conda_run(conda_executable, conda_env_name, conda_env_prefix) if _use_uv(no_uv): pip_command = [ + *conda_run, "uv", "pip", "install", @@ -985,11 +994,6 @@ def _install_command( # noqa: PLR0912, PLR0915 *env_spec.pip, ] else: - conda_run = _maybe_conda_run( - conda_executable, - conda_env_name, - conda_env_prefix, - ) pip_command = [ *conda_run, python_executable,