From 0f6fea935578039a271cdb52a5fdfcc58474bc5d Mon Sep 17 00:00:00 2001 From: William Boman Date: Tue, 7 Nov 2023 00:27:08 +0100 Subject: fix(pypi): remove -U flag and fix log message --- lua/mason-core/installer/managers/pypi.lua | 3 +-- tests/mason-core/installer/managers/pypi_spec.lua | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lua/mason-core/installer/managers/pypi.lua b/lua/mason-core/installer/managers/pypi.lua index d5368bc8..c569e0fd 100644 --- a/lua/mason-core/installer/managers/pypi.lua +++ b/lua/mason-core/installer/managers/pypi.lua @@ -176,7 +176,6 @@ local function pip_install(pkgs, extra_args) "--disable-pip-version-check", "install", "--ignore-installed", - "-U", extra_args or vim.NIL, pkgs, } @@ -206,7 +205,7 @@ end ---@param opts? { extra?: string, extra_packages?: string[], install_extra_args?: string[] } function M.install(pkg, version, opts) opts = opts or {} - log.fmt_debug("pypi: install %s %s", pkg, version, opts) + log.fmt_debug("pypi: install %s %s %s", pkg, version, opts or "") local ctx = installer.context() ctx.stdio_sink.stdout(("Installing pip package %s@%s…\n"):format(pkg, version)) return pip_install({ diff --git a/tests/mason-core/installer/managers/pypi_spec.lua b/tests/mason-core/installer/managers/pypi_spec.lua index f3a7e429..ea3da250 100644 --- a/tests/mason-core/installer/managers/pypi_spec.lua +++ b/tests/mason-core/installer/managers/pypi_spec.lua @@ -80,7 +80,6 @@ describe("pypi manager", function() "--disable-pip-version-check", "install", "--ignore-installed", - "-U", { "--proxy", "http://localhost" }, { "pip" }, } @@ -232,7 +231,6 @@ describe("pypi manager", function() "--disable-pip-version-check", "install", "--ignore-installed", - "-U", vim.NIL, -- install_extra_args { "pypi-package==1.0.0", @@ -272,7 +270,6 @@ describe("pypi manager", function() "--disable-pip-version-check", "install", "--ignore-installed", - "-U", vim.NIL, -- install_extra_args { "pypi-package[lsp]==1.0.0", @@ -299,7 +296,6 @@ describe("pypi manager", function() "--disable-pip-version-check", "install", "--ignore-installed", - "-U", { "--proxy", "http://localhost:9000" }, { "pypi-package==1.0.0", -- cgit v1.2.3-70-g09d2