IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

health/pythonx: handle "pip upgrade failure"

Browse Source 
Reference: https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
This commit is contained in:
Marco Hinz 2019-01-07 14:46:58 +01:00
parent eb91101a46
commit 75593e6fce
No known key found for this signature in database
GPG Key ID: 1C980A1B657B4A4F
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,7 @@ function! s:check_python(version) abort
let [pyname, pythonx_errors] = provider#pythonx#Detect(a:version) let [pyname, pythonx_errors] = provider#pythonx#Detect(a:version)
if empty(pyname) if empty(pyname)
call health#report_warn('No Python executable found that could `import neovim`. ' call health#report_warn('No Python executable found that can `import neovim`. '
\ . 'Using the first available executable for diagnostics.') \ . 'Using the first available executable for diagnostics.')
elseif exists('g:'.host_prog_var) elseif exists('g:'.host_prog_var)
let python_exe = pyname let python_exe = pyname
@ -387,29 +387,37 @@ function! s:check_python(version) abort
let pip = 'pip' . (a:version == 2 ? '' : '3') let pip = 'pip' . (a:version == 2 ? '' : '3')
if !empty(python_exe) if empty(python_exe)
" No Python executable can import 'neovim'. Check if any Python executable
" can import 'pynvim'. If so, that Python failed to import 'neovim' as
" well, which is most probably due to a failed pip upgrade:
" https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
let [pynvim_exe, errors] = provider#pythonx#DetectByModule('pynvim', a:version)
if !empty(pynvim_exe)
call health#report_error(
\ 'Detected pip upgrade failure: Python executable can import "pynvim" but '
\ . 'not "neovim": '. pynvim_exe,
\ "Use that Python version to reinstall \"pynvim\" and optionally \"neovim\".\n"
\ . pip ." uninstall pynvim neovim\n"
\ . pip ." install pynvim\n"
\ . pip ." install neovim # only if needed by third-party software")
endif
else
let [pyversion, current, latest, status] = s:version_info(python_exe) let [pyversion, current, latest, status] = s:version_info(python_exe)
if a:version != str2nr(pyversion) if a:version != str2nr(pyversion)
call health#report_warn('Unexpected Python version.' . call health#report_warn('Unexpected Python version.' .
\ ' This could lead to confusing error messages.') \ ' This could lead to confusing error messages.')
endif endif
if a:version == 3 && str2float(pyversion) < 3.3 if a:version == 3 && str2float(pyversion) < 3.3
call health#report_warn('Python 3.3+ is recommended.') call health#report_warn('Python 3.3+ is recommended.')
endif endif
call health#report_info('Python version: ' . pyversion) call health#report_info('Python version: ' . pyversion)
if s:is_bad_response(status) if s:is_bad_response(status)
call health#report_info(printf('pynvim version: %s (%s)', current, status)) call health#report_info(printf('pynvim version: %s (%s)', current, status))
let [module_found, _msg] = provider#pythonx#CheckForModule(python_exe,
\ 'pynvim', a:version)
if status !=? '^outdated' && module_found
" neovim module was not found, but pynvim was
call health#report_error('Importing "neovim" failed.',
\ "Reinstall \"pynvim\" and optionally \"neovim\" packages.\n" .
\ pip ." uninstall pynvim neovim\n" .
\ pip ." install pynvim\n" .
\ pip ." install neovim # only if needed by third-party software")
endif
else else
call health#report_info(printf('pynvim version: %s', current)) call health#report_info(printf('pynvim version: %s', current))
endif endif

7
runtime/autoload/provider/pythonx.vim
View File

@ -35,6 +35,11 @@ endfunction
" Returns [path_to_python_executable, error_message] " Returns [path_to_python_executable, error_message]
function! provider#pythonx#Detect(major_version) abort function! provider#pythonx#Detect(major_version) abort
return provider#pythonx#DetectByModule('neovim', a:major_version)
endfunction
" Returns [path_to_python_executable, error_message]
function! provider#pythonx#DetectByModule(module, major_version) abort
let python_exe = s:get_python_executable_from_host_var(a:major_version) let python_exe = s:get_python_executable_from_host_var(a:major_version)
if !empty(python_exe) if !empty(python_exe)
@ -45,7 +50,7 @@ function! provider#pythonx#Detect(major_version) abort
let errors = [] let errors = []
for exe in candidates for exe in candidates
let [result, error] = provider#pythonx#CheckForModule(exe, 'neovim', a:major_version) let [result, error] = provider#pythonx#CheckForModule(exe, a:module, a:major_version)
if result if result
return [exe, error] return [exe, error]
endif endif