mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-10 11:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

healthcheck: python: prefer neovim.VERSION

Browse Source
This commit is contained in:
Daniel Hahler
2017-01-08 16:23:13 +01:00
parent 5ce50504f9
commit adf32e1403
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/autoload/health/provider.vim
View File

@@ -37,6 +37,7 @@ endfunction
function! s:system(cmd, ...) abort function! s:system(cmd, ...) abort
let stdin = a:0 ? a:1 : '' let stdin = a:0 ? a:1 : ''
let ignore_stderr = a:0 > 1 ? a:2 : 0 let ignore_stderr = a:0 > 1 ? a:2 : 0
let ignore_error = a:0 > 2 ? a:3 : 0
let opts = { let opts = {
\ 'output': '', \ 'output': '',
\ 'on_stdout': function('s:system_handler'), \ 'on_stdout': function('s:system_handler'),
@@ -63,7 +64,7 @@ function! s:system(cmd, ...) abort
call health#report_error(printf('Command timed out: %s', call health#report_error(printf('Command timed out: %s',
\ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd)) \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd))
call jobstop(jobid) call jobstop(jobid)
elseif s:shell_error != 0 elseif s:shell_error != 0 && !ignore_error
call health#report_error(printf("Command error (%d) %s: %s", jobid, call health#report_error(printf("Command error (%d) %s: %s", jobid,
\ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd, \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd,
\ opts.output)) \ opts.output))
@@ -169,20 +170,27 @@ function! s:version_info(python) abort
return a == b ? 0 : a > b ? 1 : -1 return a == b ? 0 : a > b ? 1 : -1
endfunction endfunction
let nvim_version = 'unable to find neovim Python module version' " Try to get neovim.VERSION (added in 0.1.11dev).
let base = fnamemodify(nvim_path, ':h') let nvim_version = s:system(['python', '-c',
let metas = glob(base.'-*/METADATA', 1, 1) \ 'from neovim import VERSION as v; '.
\ + glob(base.'-*/PKG-INFO', 1, 1) \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'],
\ + glob(base.'.egg-info/PKG-INFO', 1, 1) \ '', 1, 1)
let metas = sort(metas, 's:compare') if empty(nvim_version)
let nvim_version = 'unable to find neovim Python module version'
let base = fnamemodify(nvim_path, ':h')
let metas = glob(base.'-*/METADATA', 1, 1)
\ + glob(base.'-*/PKG-INFO', 1, 1)
\ + glob(base.'.egg-info/PKG-INFO', 1, 1)
let metas = sort(metas, 's:compare')
if !empty(metas) if !empty(metas)
for meta_line in readfile(metas[0]) for meta_line in readfile(metas[0])
if meta_line =~# '^Version:' if meta_line =~# '^Version:'
let nvim_version = matchstr(meta_line, '^Version: \zs\S\+') let nvim_version = matchstr(meta_line, '^Version: \zs\S\+')
break break
endif endif
endfor endfor
endif
endif endif
let nvim_path_base = fnamemodify(nvim_path, ':~:h') let nvim_path_base = fnamemodify(nvim_path, ':~:h')