Skip to content

Commit

Permalink
fix(pypi): allow access to system site packages by default (#1584)
Browse files Browse the repository at this point in the history
Co-authored-by: William Boman <[email protected]>
  • Loading branch information
BlueDrink9 and williamboman authored Jul 7, 2024
1 parent 0950b15 commit 2be2600
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lua/mason-core/installer/managers/pypi.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ local function create_venv(pkg)

log.fmt_debug("Found python3 installation version=%s, executable=%s", target.version, target.executable)
ctx.stdio_sink.stdout "Creating virtual environment…\n"
return ctx.spawn[target.executable] { "-m", "venv", VENV_DIR }
return ctx.spawn[target.executable] { "-m", "venv", "--system-site-packages", VENV_DIR }
end

---@param ctx InstallContext
Expand Down Expand Up @@ -165,6 +165,7 @@ local function pip_install(pkgs, extra_args)
"pip",
"--disable-pip-version-check",
"install",
"--ignore-installed",
"-U",
extra_args or vim.NIL,
pkgs,
Expand Down
6 changes: 6 additions & 0 deletions tests/mason-core/installer/managers/pypi_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe("pypi manager", function()
assert.spy(ctx.spawn.python3).was_called_with {
"-m",
"venv",
"--system-site-packages",
"venv",
}
end)
Expand All @@ -62,6 +63,7 @@ describe("pypi manager", function()
assert.spy(ctx.spawn.python3).was_called_with {
"-m",
"venv",
"--system-site-packages",
"venv",
}
assert.spy(ctx.spawn[venv_py(ctx)]).was_called(1)
Expand All @@ -70,6 +72,7 @@ describe("pypi manager", function()
"pip",
"--disable-pip-version-check",
"install",
"--ignore-installed",
"-U",
{ "--proxy", "http://localhost" },
{ "pip" },
Expand Down Expand Up @@ -188,6 +191,7 @@ describe("pypi manager", function()
"pip",
"--disable-pip-version-check",
"install",
"--ignore-installed",
"-U",
vim.NIL, -- install_extra_args
{
Expand Down Expand Up @@ -227,6 +231,7 @@ describe("pypi manager", function()
"pip",
"--disable-pip-version-check",
"install",
"--ignore-installed",
"-U",
vim.NIL, -- install_extra_args
{
Expand All @@ -253,6 +258,7 @@ describe("pypi manager", function()
"pip",
"--disable-pip-version-check",
"install",
"--ignore-installed",
"-U",
{ "--proxy", "http://localhost:9000" },
{
Expand Down

0 comments on commit 2be2600

Please sign in to comment.