Improve support for python package manage: pipenv, poetry and uv (#4825)

autoload/ale/fixers/autoflake.vim

@@ -4,22 +4,40 @@
 call ale#Set('python_autoflake_executable', 'autoflake')
 call ale#Set('python_autoflake_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_autoflake_options', '')
+call ale#Set('python_autoflake_auto_pipenv', 0)
+call ale#Set('python_autoflake_auto_poetry', 0)
+call ale#Set('python_autoflake_auto_uv', 0)
+
+function! ale#fixers#autoflake#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_autoflake_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_autoflake_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_autoflake_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_autoflake', ['autoflake'])
+endfunction
 
 function! ale#fixers#autoflake#Fix(buffer) abort
-    let l:executable = ale#python#FindExecutable(
-    \   a:buffer,
-    \   'python_autoflake',
-    \   ['autoflake'],
-    \)
+    let l:executable = ale#fixers#autoflake#GetExecutable(a:buffer)
 
-    if !executable(l:executable)
-        return 0
-    endif
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
+    \   ? ' run autoflake'
+    \   : ''
 
     let l:options = ale#Var(a:buffer, 'python_autoflake_options')
 
     return {
-    \   'command': ale#Escape(l:executable)
+    \   'command': ale#Escape(l:executable) . l:exec_args
     \       . (!empty(l:options) ? ' ' . l:options : '')
     \       . ' --in-place '
     \       . ' %t',

autoload/ale/fixers/autoimport.vim

@@ -4,23 +4,41 @@
 call ale#Set('python_autoimport_executable', 'autoimport')
 call ale#Set('python_autoimport_options', '')
 call ale#Set('python_autoimport_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('python_autoimport_auto_pipenv', 0)
+call ale#Set('python_autoimport_auto_poetry', 0)
+call ale#Set('python_autoimport_auto_uv', 0)
+
+function! ale#fixers#autoimport#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_autoimport_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_autoimport_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_autoimport_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_autoimport', ['autoimport'])
+endfunction
 
 function! ale#fixers#autoimport#Fix(buffer) abort
+    let l:executable = ale#fixers#autoimport#GetExecutable(a:buffer)
+
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
+    \   ? ' run autoimport'
+    \   : ''
+
     let l:options = ale#Var(a:buffer, 'python_autoimport_options')
 
-    let l:executable = ale#python#FindExecutable(
-    \   a:buffer,
-    \   'python_autoimport',
-    \   ['autoimport'],
-    \)
-
-    if !executable(l:executable)
-        return 0
-    endif
-
     return {
     \   'cwd': '%s:h',
-    \   'command': ale#Escape(l:executable)
+    \   'command': ale#Escape(l:executable) . l:exec_args
     \       . (!empty(l:options) ? ' ' . l:options : '')
     \       . ' -',
     \}

autoload/ale/fixers/autopep8.vim

@@ -4,22 +4,40 @@
 call ale#Set('python_autopep8_executable', 'autopep8')
 call ale#Set('python_autopep8_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_autopep8_options', '')
+call ale#Set('python_autopep8_auto_pipenv', 0)
+call ale#Set('python_autopep8_auto_poetry', 0)
+call ale#Set('python_autopep8_auto_uv', 0)
+
+function! ale#fixers#autopep8#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_autopep8_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_autopep8_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_autopep8_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_autopep8', ['autopep8'])
+endfunction
 
 function! ale#fixers#autopep8#Fix(buffer) abort
-    let l:executable = ale#python#FindExecutable(
-    \   a:buffer,
-    \   'python_autopep8',
-    \   ['autopep8'],
-    \)
+    let l:executable = ale#fixers#autopep8#GetExecutable(a:buffer)
 
-    if !executable(l:executable)
-        return 0
-    endif
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
+    \   ? ' run autopep8'
+    \   : ''
 
     let l:options = ale#Var(a:buffer, 'python_autopep8_options')
 
     return {
-    \   'command': ale#Escape(l:executable)
+    \   'command': ale#Escape(l:executable) . l:exec_args
     \       . (!empty(l:options) ? ' ' . l:options : '')
     \       . ' -',
     \}

autoload/ale/fixers/black.vim

@@ -6,6 +6,7 @@ call ale#Set('python_black_use_global', get(g:, 'ale_use_global_executables', 0)
 call ale#Set('python_black_options', '')
 call ale#Set('python_black_auto_pipenv', 0)
 call ale#Set('python_black_auto_poetry', 0)
+call ale#Set('python_black_auto_uv', 0)
 call ale#Set('python_black_change_directory', 1)
 
 function! ale#fixers#black#GetExecutable(buffer) abort
@@ -19,6 +20,11 @@ function! ale#fixers#black#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_black_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_black', ['black'])
 endfunction
 
@@ -26,7 +32,7 @@ function! ale#fixers#black#Fix(buffer) abort
     let l:executable = ale#fixers#black#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'black'])
     endif
 

autoload/ale/fixers/isort.vim

@@ -6,6 +6,7 @@ call ale#Set('python_isort_use_global', get(g:, 'ale_use_global_executables', 0)
 call ale#Set('python_isort_options', '')
 call ale#Set('python_isort_auto_pipenv', 0)
 call ale#Set('python_isort_auto_poetry', 0)
+call ale#Set('python_isort_auto_uv', 0)
 
 function! ale#fixers#isort#GetExecutable(buffer) abort
     if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_isort_auto_pipenv'))
@@ -18,6 +19,11 @@ function! ale#fixers#isort#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_isort_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_isort', ['isort'])
 endfunction
 
@@ -25,7 +31,7 @@ function! ale#fixers#isort#GetCmd(buffer) abort
     let l:executable = ale#fixers#isort#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'isort'])
     endif
 
@@ -36,7 +42,7 @@ function! ale#fixers#isort#FixForVersion(buffer, version) abort
     let l:executable = ale#fixers#isort#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'isort'])
     endif
 

autoload/ale/fixers/pycln.vim

@@ -7,6 +7,7 @@ call ale#Set('python_pycln_use_global', get(g:, 'ale_use_global_executables', 0)
 call ale#Set('python_pycln_change_directory', 1)
 call ale#Set('python_pycln_auto_pipenv', 0)
 call ale#Set('python_pycln_auto_poetry', 0)
+call ale#Set('python_pycln_auto_uv', 0)
 call ale#Set('python_pycln_config_file', '')
 
 function! ale#fixers#pycln#GetCwd(buffer) abort
@@ -31,12 +32,17 @@ function! ale#fixers#pycln#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_pycln_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_pycln', ['pycln'])
 endfunction
 
 function! ale#fixers#pycln#GetCommand(buffer) abort
     let l:executable = ale#fixers#pycln#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'pipenv\|poetry$'
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
     \   ? ' run pycln'
     \   : ''
 
@@ -47,7 +53,7 @@ function! ale#fixers#pycln#FixForVersion(buffer, version) abort
     let l:executable = ale#fixers#pycln#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'pycln'])
     endif
 

autoload/ale/fixers/pyflyby.vim

@@ -7,6 +7,7 @@ call ale#Set('python_pyflyby_use_global', get(g:, 'ale_use_global_executables',
 call ale#Set('python_pyflyby_options', '')
 call ale#Set('python_pyflyby_auto_pipenv', 0)
 call ale#Set('python_pyflyby_auto_poetry', 0)
+call ale#Set('python_pyflyby_auto_uv', 0)
 
 function! ale#fixers#pyflyby#GetExecutable(buffer) abort
     if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_pyflyby_auto_pipenv'))
@@ -19,6 +20,11 @@ function! ale#fixers#pyflyby#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_pyflyby_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_pyflyby', ['tidy-imports'])
 endfunction
 
@@ -27,7 +33,7 @@ function! ale#fixers#pyflyby#Fix(buffer) abort
     let l:executable = ale#fixers#pyflyby#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'tidy-imports'])
     endif
 

autoload/ale/fixers/reorder_python_imports.vim

@@ -4,22 +4,40 @@
 call ale#Set('python_reorder_python_imports_executable', 'reorder-python-imports')
 call ale#Set('python_reorder_python_imports_options', '')
 call ale#Set('python_reorder_python_imports_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('python_reorder_python_imports_auto_pipenv', 0)
+call ale#Set('python_reorder_python_imports_auto_poetry', 0)
+call ale#Set('python_reorder_python_imports_auto_uv', 0)
+
+function! ale#fixers#reorder_python_imports#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_reorder_python_imports_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_reorder_python_imports_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_reorder_python_imports_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_reorder_python_imports', ['reorder-python-imports'])
+endfunction
 
 function! ale#fixers#reorder_python_imports#Fix(buffer) abort
-    let l:executable = ale#python#FindExecutable(
-    \   a:buffer,
-    \   'python_reorder_python_imports',
-    \   ['reorder-python-imports'],
-    \)
+    let l:executable = ale#fixers#reorder_python_imports#GetExecutable(a:buffer)
 
-    if !executable(l:executable)
-        return 0
-    endif
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
+    \   ? ' run reorder-python-imports'
+    \   : ''
 
     let l:options = ale#Var(a:buffer, 'python_reorder_python_imports_options')
 
     return {
-    \   'command': ale#Escape(l:executable)
+    \   'command': ale#Escape(l:executable) . l:exec_args
     \       . (!empty(l:options) ? ' ' . l:options : '') . ' -',
     \}
 endfunction

autoload/ale/fixers/ruff.vim

@@ -7,6 +7,7 @@ call ale#Set('python_ruff_use_global', get(g:, 'ale_use_global_executables', 0))
 call ale#Set('python_ruff_change_directory', 1)
 call ale#Set('python_ruff_auto_pipenv', 0)
 call ale#Set('python_ruff_auto_poetry', 0)
+call ale#Set('python_ruff_auto_uv', 0)
 
 function! ale#fixers#ruff#GetCwd(buffer) abort
     if ale#Var(a:buffer, 'python_ruff_change_directory')
@@ -30,12 +31,17 @@ function! ale#fixers#ruff#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_ruff_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_ruff', ['ruff'])
 endfunction
 
 function! ale#fixers#ruff#GetCommand(buffer) abort
     let l:executable = ale#fixers#ruff#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'pipenv\|poetry$'
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
     \   ? ' run ruff'
     \   : ''
 
@@ -46,7 +52,7 @@ function! ale#fixers#ruff#FixForVersion(buffer, version) abort
     let l:executable = ale#fixers#ruff#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'ruff'])
     endif
 

autoload/ale/fixers/ruff_format.vim

@@ -7,6 +7,7 @@ call ale#Set('python_ruff_format_use_global', get(g:, 'ale_use_global_executable
 call ale#Set('python_ruff_format_change_directory', 1)
 call ale#Set('python_ruff_format_auto_pipenv', 0)
 call ale#Set('python_ruff_format_auto_poetry', 0)
+call ale#Set('python_ruff_format_auto_uv', 0)
 
 function! ale#fixers#ruff_format#GetCwd(buffer) abort
     if ale#Var(a:buffer, 'python_ruff_format_change_directory')
@@ -30,12 +31,17 @@ function! ale#fixers#ruff_format#GetExecutable(buffer) abort
         return 'poetry'
     endif
 
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_ruff_format_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
     return ale#python#FindExecutable(a:buffer, 'python_ruff_format', ['ruff'])
 endfunction
 
 function! ale#fixers#ruff_format#GetCommand(buffer) abort
     let l:executable = ale#fixers#ruff_format#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'pipenv\|poetry$'
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
     \   ? ' run ruff'
     \   : ''
 
@@ -46,7 +52,7 @@ function! ale#fixers#ruff_format#Fix(buffer) abort
     let l:executable = ale#fixers#ruff_format#GetExecutable(a:buffer)
     let l:cmd = [ale#Escape(l:executable)]
 
-    if l:executable =~? 'pipenv\|poetry$'
+    if l:executable =~? 'pipenv\|poetry\|uv$'
         call extend(l:cmd, ['run', 'ruff'])
     endif
 

autoload/ale/fixers/yapf.vim

@@ -3,17 +3,35 @@
 
 call ale#Set('python_yapf_executable', 'yapf')
 call ale#Set('python_yapf_use_global', get(g:, 'ale_use_global_executables', 0))
+call ale#Set('python_yapf_auto_pipenv', 0)
+call ale#Set('python_yapf_auto_poetry', 0)
+call ale#Set('python_yapf_auto_uv', 0)
+
+function! ale#fixers#yapf#GetExecutable(buffer) abort
+    if (ale#Var(a:buffer, 'python_auto_pipenv') || ale#Var(a:buffer, 'python_yapf_auto_pipenv'))
+    \ && ale#python#PipenvPresent(a:buffer)
+        return 'pipenv'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_poetry') || ale#Var(a:buffer, 'python_yapf_auto_poetry'))
+    \ && ale#python#PoetryPresent(a:buffer)
+        return 'poetry'
+    endif
+
+    if (ale#Var(a:buffer, 'python_auto_uv') || ale#Var(a:buffer, 'python_yapf_auto_uv'))
+    \ && ale#python#UvPresent(a:buffer)
+        return 'uv'
+    endif
+
+    return ale#python#FindExecutable(a:buffer, 'python_yapf', ['yapf'])
+endfunction
 
 function! ale#fixers#yapf#Fix(buffer) abort
-    let l:executable = ale#python#FindExecutable(
-    \   a:buffer,
-    \   'python_yapf',
-    \   ['yapf'],
-    \)
+    let l:executable = ale#fixers#yapf#GetExecutable(a:buffer)
 
-    if !executable(l:executable)
-        return 0
-    endif
+    let l:exec_args = l:executable =~? 'pipenv\|poetry\|uv$'
+    \   ? ' run yapf'
+    \   : ''
 
     let l:config = ale#path#FindNearestFile(a:buffer, '.style.yapf')
     let l:config_options = !empty(l:config)
@@ -21,6 +39,6 @@ function! ale#fixers#yapf#Fix(buffer) abort
     \   : ''
 
     return {
-    \   'command': ale#Escape(l:executable) . l:config_options,
+    \   'command': ale#Escape(l:executable) . l:exec_args . l:config_options,
     \}
 endfunction

autoload/ale/python.vim

@@ -3,6 +3,7 @@
 
 call ale#Set('python_auto_pipenv', '0')
 call ale#Set('python_auto_poetry', '0')
+call ale#Set('python_auto_uv', '0')
 
 let s:sep = has('win32') ? '\' : '/'
 " bin is used for Unix virtualenv directories, and Scripts is for Windows.
@@ -43,6 +44,7 @@ function! ale#python#FindProjectRootIni(buffer) abort
         \|| filereadable(l:path . '/poetry.lock')
         \|| filereadable(l:path . '/pyproject.toml')
         \|| filereadable(l:path . '/.tool-versions')
+        \|| filereadable(l:path . '/uv.lock')
             return l:path
         endif
     endfor
@@ -192,3 +194,8 @@ endfunction
 function! ale#python#PoetryPresent(buffer) abort
     return findfile('poetry.lock', expand('#' . a:buffer . ':p:h') . ';') isnot# ''
 endfunction
+
+" Detects whether a poetry environment is present.
+function! ale#python#UvPresent(buffer) abort
+    return findfile('uv.lock', expand('#' . a:buffer . ':p:h') . ';') isnot# ''
+endfunction