Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade debugpy #903

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Upgrade debugpy #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3649e89
Allow multiple instances of vimspector to open the log (prevent ATTEN…
puremourning Jan 3, 2025
4ef7397
Upgrade debugpy
puremourning Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autoload/vimspector/internal/job.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function! vimspector#internal#job#StartCommandWithLog(

let l:index = len( s:commands[ a:session_id ][ a:category ] )

let buf = '_vimspector_log_' . a:session_id . '_' . a:category
let buf = '_vimspector_log_' . a:session_id . '_' . a:category . '_' . getpid()

call add( s:commands[ a:session_id ][ a:category ], job_start(
\ a:cmd,
Expand Down
4 changes: 2 additions & 2 deletions python3/vimspector/gadgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
'url': 'https://github.com/microsoft/debugpy/archive/${file_name}'
},
'all': {
'version': '1.8.1',
'file_name': 'v1.8.1.zip',
'version': '1.8.11',
'file_name': 'v1.8.11.zip',
'checksum':
''
},
Expand Down
10 changes: 4 additions & 6 deletions tests/child_sessions.test.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ function! s:StartDebugging( ... )
endfunction

function! Test_Python_MultiProcessing()
" For some reason the 'fork' mp style causes crashes in debugpy at least on
" macOS (but only when using neovim!). And for the tests to be stable, we need
" to ensure there's only 1 child launched. With the default 'launch' behaviour
" of multiprocessing, we get arbitrary ordering for the additional watchdog
" chld process
call SkipNeovim()
" For some reason, fork style multiprocessing debugging no longer works on
" macOS properly. Breakpoints are hit, but step/next requests don't work
" correctly
call SkipOn( v:null, 'Darwin' )
call s:StartDebugging()

call WaitForAssert( {->
Expand Down
15 changes: 12 additions & 3 deletions tests/lib/plugin/shared.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,19 @@ function! SkipNeovim() abort
endfunction

function! SkipOn( arch, system ) abort
if trim( system( 'uname -m' ) ) == a:arch &&
\ trim( system( 'uname -s' ) ) == a:system
throw 'skipped: Not on this architecture'
if a:arch != v:null && trim( system( 'uname -m' ) ) != a:arch
return
endif

if a:system != v:null && trim( system( 'uname -s' ) ) != a:system
return
endif

throw 'skipped: Not on this architecture/platform ('
\ . a:arch
\ . '/'
\ . a:system .
\ ')'
endfunction

function! SkipIf( f, msg ) abort
Expand Down
Loading