acoolname/neotest-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: python detection on windows (#92)

Browse Source 
- virtualenvs on windows use `Scripts` instead of `bin`
  993ba1316a
- line endings of course
This commit is contained in:
EdVanDance
2025-05-28 17:18:54 +02:00
committed by GitHub
parent 61e878f4b3
commit 34c9f6f3dc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lua/neotest-python/base.lua
View File

@@ -25,6 +25,7 @@ M.module_exists = function(module, python_command)
end end
local python_command_mem = {} local python_command_mem = {}
local venv_bin = vim.loop.os_uname().sysname:match("Windows") and "Scripts" or "bin"
---@return string[] ---@return string[]
function M.get_python_command(root) function M.get_python_command(root)
@@ -34,14 +35,14 @@ function M.get_python_command(root)
end end
-- Use activated virtualenv. -- Use activated virtualenv.
if vim.env.VIRTUAL_ENV then if vim.env.VIRTUAL_ENV then
python_command_mem[root] = { Path:new(vim.env.VIRTUAL_ENV, "bin", "python").filename } python_command_mem[root] = { Path:new(vim.env.VIRTUAL_ENV, venv_bin, "python").filename }
return python_command_mem[root] return python_command_mem[root]
end end
for _, pattern in ipairs({ "*", ".*" }) do for _, pattern in ipairs({ "*", ".*" }) do
local match = nio.fn.glob(Path:new(root or nio.fn.getcwd(), pattern, "pyvenv.cfg").filename) local match = nio.fn.glob(Path:new(root or nio.fn.getcwd(), pattern, "pyvenv.cfg").filename)
if match ~= "" then if match ~= "" then
python_command_mem[root] = { (Path:new(match):parent() / "bin" / "python").filename } python_command_mem[root] = { (Path:new(match):parent() / venv_bin / "python").filename }
return python_command_mem[root] return python_command_mem[root]
end end
end end
@@ -49,7 +50,7 @@ function M.get_python_command(root)
if lib.files.exists("Pipfile") then if lib.files.exists("Pipfile") then
local success, exit_code, data = pcall(lib.process.run, { "pipenv", "--py" }, { stdout = true }) local success, exit_code, data = pcall(lib.process.run, { "pipenv", "--py" }, { stdout = true })
if success and exit_code == 0 then if success and exit_code == 0 then
local venv = data.stdout:gsub("\n", "") local venv = data.stdout:gsub("\r?\n", "")
if venv then if venv then
python_command_mem[root] = { Path:new(venv).filename } python_command_mem[root] = { Path:new(venv).filename }
return python_command_mem[root] return python_command_mem[root]
@@ -64,9 +65,9 @@ function M.get_python_command(root)
{ stdout = true } { stdout = true }
) )
if success and exit_code == 0 then if success and exit_code == 0 then
local venv = data.stdout:gsub("\n", "") local venv = data.stdout:gsub("\r?\n", "")
if venv then if venv then
python_command_mem[root] = { Path:new(venv, "bin", "python").filename } python_command_mem[root] = { Path:new(venv, venv_bin, "python").filename }
return python_command_mem[root] return python_command_mem[root]
end end
end end