Merge remote-tracking branch 'origin/main' into fix/prefer_stock_python

* origin/main: tests(pypi): fix assertions (williamboman#1750) fix(pypi): allow access to system site packages by default (williamboman#1584)
cih9088 · Jul 9, 2024 · ea7954e · ea7954e
2 parents e516a9e + 2af3b57
commit ea7954e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lua/mason-core/installer/managers/pypi.lua b/lua/mason-core/installer/managers/pypi.lua
@@ -127,7 +127,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
@@ -167,6 +167,7 @@ local function pip_install(pkgs, extra_args)
  "pip",
  "--disable-pip-version-check",
  "install",
+ "--ignore-installed",
  "-U",
  extra_args or vim.NIL,
  pkgs,

diff --git a/tests/mason-core/installer/managers/pypi_spec.lua b/tests/mason-core/installer/managers/pypi_spec.lua
@@ -38,6 +38,7 @@ describe("pypi manager", function()
  assert.spy(ctx.spawn.python3).was_called_with {
  "-m",
  "venv",
+ "--system-site-packages",
  "venv",
  }
  end)
@@ -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)
@@ -70,6 +72,7 @@ describe("pypi manager", function()
  "pip",
  "--disable-pip-version-check",
  "install",
+ "--ignore-installed",
  "-U",
  { "--proxy", "http://localhost" },
  { "pip" },
@@ -100,6 +103,7 @@ describe("pypi manager", function()
  assert.spy(ctx.spawn["python3.12"]).was_called_with {
  "-m",
  "venv",
+ "--system-site-packages",
  "venv",
  }
  end)
@@ -166,6 +170,7 @@ describe("pypi manager", function()
  assert.spy(ctx.spawn.python3).was_called_with {
  "-m",
  "venv",
+ "--system-site-packages",
  "venv",
  }
  assert
@@ -188,6 +193,7 @@ describe("pypi manager", function()
  "pip",
  "--disable-pip-version-check",
  "install",
+ "--ignore-installed",
  "-U",
  vim.NIL, -- install_extra_args
  {
@@ -227,6 +233,7 @@ describe("pypi manager", function()
  "pip",
  "--disable-pip-version-check",
  "install",
+ "--ignore-installed",
  "-U",
  vim.NIL, -- install_extra_args
  {
@@ -253,6 +260,7 @@ describe("pypi manager", function()
  "pip",
  "--disable-pip-version-check",
  "install",
+ "--ignore-installed",
  "-U",
  { "--proxy", "http://localhost:9000" },
  {