From b9744076a1603b37bc861e1aa885bbc052e0ed63 Mon Sep 17 00:00:00 2001 From: Brendan Maginnis Date: Thu, 9 Dec 2021 14:24:32 +0000 Subject: Pass full path to pydocstyle (#3995) * Pass full path to pydocstyle * Update pydocstyle tests --- ale_linters/python/pydocstyle.vim | 2 +- test/linter/test_pydocstyle.vader | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ale_linters/python/pydocstyle.vim b/ale_linters/python/pydocstyle.vim index aa0e8b20..ef0d818c 100644 --- a/ale_linters/python/pydocstyle.vim +++ b/ale_linters/python/pydocstyle.vim @@ -29,7 +29,7 @@ function! ale_linters#python#pydocstyle#GetCommand(buffer) abort return ale#Escape(l:executable) . l:exec_args \ . ale#Pad(ale#Var(a:buffer, 'python_pydocstyle_options')) - \ . ' %s:t' + \ . ' %s' endfunction function! ale_linters#python#pydocstyle#Handle(buffer, lines) abort diff --git a/test/linter/test_pydocstyle.vader b/test/linter/test_pydocstyle.vader index 24d669c6..fc7fbbf2 100644 --- a/test/linter/test_pydocstyle.vader +++ b/test/linter/test_pydocstyle.vader @@ -1,45 +1,45 @@ Before: call ale#assert#SetUpLinterTest('python', 'pydocstyle') - call ale#test#SetFilename('test.py') + call ale#test#SetFilename('example/test.py') After: call ale#assert#TearDownLinterTest() Execute(The pydocstyle command callback should return default string): AssertLinterCwd '%s:h' - AssertLinter 'pydocstyle', ale#Escape('pydocstyle') . ' %s:t' + AssertLinter 'pydocstyle', ale#Escape('pydocstyle') . ' %s' Execute(The pydocstyle command callback should allow options): let g:ale_python_pydocstyle_options = '--verbose' - AssertLinter 'pydocstyle', ale#Escape('pydocstyle') . ' --verbose %s:t' + AssertLinter 'pydocstyle', ale#Escape('pydocstyle') . ' --verbose %s' Execute(The pydocstyle executable should be configurable): let g:ale_python_pydocstyle_executable = '~/.local/bin/pydocstyle' AssertLinter '~/.local/bin/pydocstyle', - \ ale#Escape('~/.local/bin/pydocstyle') . ' %s:t' + \ ale#Escape('~/.local/bin/pydocstyle') . ' %s' Execute(Setting executable to 'pipenv' appends 'run pydocstyle'): let g:ale_python_pydocstyle_executable = 'path/to/pipenv' AssertLinter 'path/to/pipenv', - \ ale#Escape('path/to/pipenv') . ' run pydocstyle %s:t' + \ ale#Escape('path/to/pipenv') . ' run pydocstyle %s' Execute(Pipenv is detected when python_pydocstyle_auto_pipenv is set): let g:ale_python_pydocstyle_auto_pipenv = 1 call ale#test#SetFilename('../test-files/python/pipenv/whatever.py') - AssertLinter 'pipenv', ale#Escape('pipenv') . ' run pydocstyle %s:t' + AssertLinter 'pipenv', ale#Escape('pipenv') . ' run pydocstyle %s' Execute(Setting executable to 'poetry' appends 'run pydocstyle'): let g:ale_python_pydocstyle_executable = 'path/to/poetry' AssertLinter 'path/to/poetry', - \ ale#Escape('path/to/poetry') . ' run pydocstyle %s:t' + \ ale#Escape('path/to/poetry') . ' run pydocstyle %s' Execute(Poetry is detected when python_pydocstyle_auto_poetry is set): let g:ale_python_pydocstyle_auto_poetry = 1 call ale#test#SetFilename('../test-files/python/poetry/whatever.py') - AssertLinter 'poetry', ale#Escape('poetry') . ' run pydocstyle %s:t' + AssertLinter 'poetry', ale#Escape('poetry') . ' run pydocstyle %s' -- cgit v1.2.3