diff options
| author | Silico_Biomancer <BlueDrink9@users.noreply.github.com> | 2024-07-08 09:47:14 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-07 23:47:14 +0200 |
| commit | 2be2600f9b5a61b0c6109a3fb161b3abe75e5195 (patch) | |
| tree | aa2bf75d7d8fd41d2eb370916a3de8dabcbd1e5b | |
| parent | feat(pypi): improve resolving suitable python version (#1725) (diff) | |
| download | mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar.gz mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar.bz2 mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar.lz mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar.xz mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.tar.zst mason-2be2600f9b5a61b0c6109a3fb161b3abe75e5195.zip | |
fix(pypi): allow access to system site packages by default (#1584)
Co-authored-by: William Boman <william@redwill.se>
| -rw-r--r-- | lua/mason-core/installer/managers/pypi.lua | 3 | ||||
| -rw-r--r-- | tests/mason-core/installer/managers/pypi_spec.lua | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lua/mason-core/installer/managers/pypi.lua b/lua/mason-core/installer/managers/pypi.lua index e9d54559..8dab25d9 100644 --- a/lua/mason-core/installer/managers/pypi.lua +++ b/lua/mason-core/installer/managers/pypi.lua @@ -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 @@ -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, diff --git a/tests/mason-core/installer/managers/pypi_spec.lua b/tests/mason-core/installer/managers/pypi_spec.lua index a746ef08..db3d7d2a 100644 --- 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" }, @@ -188,6 +191,7 @@ describe("pypi manager", function() "pip", "--disable-pip-version-check", "install", + "--ignore-installed", "-U", vim.NIL, -- install_extra_args { @@ -227,6 +231,7 @@ describe("pypi manager", function() "pip", "--disable-pip-version-check", "install", + "--ignore-installed", "-U", vim.NIL, -- install_extra_args { @@ -253,6 +258,7 @@ describe("pypi manager", function() "pip", "--disable-pip-version-check", "install", + "--ignore-installed", "-U", { "--proxy", "http://localhost:9000" }, { |