mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(health): combine python and virtualenv healthchecks (#23004)

Browse Source 
fix(health): combine python and virtualenv health checks
This commit is contained in:
Gregory Anders
2023-04-10 15:46:22 -06:00
committed by GitHub
parent cde4892b49
commit 03a021f378
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runtime/lua/provider/health.lua
View File

@@ -372,6 +372,13 @@ local function version_info(python)
return { python_version, nvim_version, pypi_version, version_status } return { python_version, nvim_version, pypi_version, version_status }
end end
-- Resolves Python executable path by invoking and checking `sys.executable`.
local function python_exepath(invocation)
return vim.fs.normalize(
system(vim.fn.fnameescape(invocation) .. ' -c "import sys; sys.stdout.write(sys.executable)"')
)
end
local function python() local function python()
start('Python 3 provider (optional)') start('Python 3 provider (optional)')
@@ -569,20 +576,9 @@ local function python()
ok('Latest pynvim is installed.') ok('Latest pynvim is installed.')
end end
end end
end
-- Resolves Python executable path by invoking and checking `sys.executable`.
local function python_exepath(invocation)
return vim.fs.normalize(
system(vim.fn.fnameescape(invocation) .. ' -c "import sys; sys.stdout.write(sys.executable)"')
)
end
-- Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
-- Nvim and subshells.
local function virtualenv()
start('Python virtualenv') start('Python virtualenv')
if not os.getenv('VIRTUAL_ENV') then if not virtual_env then
ok('no $VIRTUAL_ENV') ok('no $VIRTUAL_ENV')
return return
end end
@@ -592,10 +588,11 @@ local function virtualenv()
-- The virtualenv should contain some Python executables, and those -- The virtualenv should contain some Python executables, and those
-- executables should be first both on Nvim's $PATH and the $PATH of -- executables should be first both on Nvim's $PATH and the $PATH of
-- subshells launched from Nvim. -- subshells launched from Nvim.
local bin_dir = (iswin and '/Scripts' or '/bin') local bin_dir = iswin and 'Scripts' or 'bin'
local venv_bins = vim.fn.glob(os.getenv('VIRTUAL_ENV') .. bin_dir .. '/python*', true, true) local venv_bins = vim.tbl_filter(function(v)
-- XXX: Remove irrelevant executables found in bin/. -- XXX: Remove irrelevant executables found in bin/.
venv_bins = vim.fn.filter(venv_bins, 'v:val !~# "python-config"') return not v:match('python%-config')
end, vim.fn.glob(string.format('%s/%s/python*', virtual_env, bin_dir), true, true))
if vim.tbl_count(venv_bins) > 0 then if vim.tbl_count(venv_bins) > 0 then
for _, venv_bin in pairs(venv_bins) do for _, venv_bin in pairs(venv_bins) do
venv_bin = vim.fs.normalize(venv_bin) venv_bin = vim.fs.normalize(venv_bin)
@@ -631,7 +628,7 @@ local function virtualenv()
.. ' directory.' .. ' directory.'
end end
local msg = '$VIRTUAL_ENV is set to: ' .. os.getenv('VIRTUAL_ENV') local msg = '$VIRTUAL_ENV is set to: ' .. virtual_env
if vim.tbl_count(errors) > 0 then if vim.tbl_count(errors) > 0 then
if vim.tbl_count(venv_bins) > 0 then if vim.tbl_count(venv_bins) > 0 then
msg = msg msg = msg
@@ -911,7 +908,6 @@ end
function M.check() function M.check()
clipboard() clipboard()
python() python()
virtualenv()
ruby() ruby()
node() node()
perl() perl()