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

Fix matplotlib backend computation #1811

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Fix matplotlib backend computation #1811

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
53d9c16
Fix matplotlib backend computation and problem found with just my cod…
rchiodo Jan 15, 2025
27c5e30
Remove extra logging
rchiodo Jan 15, 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 CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ If you have an existing test failing, you can investigate it by running the test
- Clone the repo a second time
- Change the code in `tests_python/debugger_unittest.py` so that the test prints out logs on success too (by default it only logs the output on a failure)
- Run the failing test in the second clone
- Run the failing test in your original clone
- Run the failing test in your original clone (with the --capture=tee-sys so that it outputs the log)
- Diff the results by finding the log file name in the output and diffing those two files
- Add more logging around where the differences first appear
- Repeat running and diffing
Expand Down
6 changes: 3 additions & 3 deletions src/debugpy/_vendored/pydevd/_pydevd_sys_monitoring/_pydevd_sys_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,10 @@ def _get_func_code_info(code_obj, frame_or_depth) -> FuncCodeInfo:
frame = frame_or_depth
assert frame.f_code is code_obj

func_code_info.filtered_out_force_checked = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, py_db.get_use_libraries_filter())
func_code_info.filtered_out_force_checked = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, True)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be True as this flag is used elsewhere. However always_filtered_out should be determined by whether or not the file is filtered (which it isn't when justMyCode = false)


if py_db.is_files_filter_enabled:
func_code_info.always_filtered_out = func_code_info.filtered_out_force_checked
func_code_info.always_filtered_out = py_db.apply_files_filter(frame, func_code_info.abs_path_filename, False)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

always_filtered_out needs to recheck that the file is actually always filtered out. justMyCode would have to be true or it would have to match the exclusion filters if it's not in the user's project.

if func_code_info.always_filtered_out:
_code_to_func_code_info_cache[code_obj] = func_code_info
return func_code_info
Expand Down Expand Up @@ -1163,7 +1163,7 @@ def _return_event(code, instruction, retval):
or (
info.pydev_step_cmd == CMD_STEP_INTO_MY_CODE
and frame.f_back is not None
and not py_db.apply_files_filter(frame.f_back, frame.f_back.f_code.co_filename, py_db.get_use_libraries_filter())
and not py_db.apply_files_filter(frame.f_back, frame.f_back.f_code.co_filename, True)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needed to go back to true. My original change was incorrect.

)
):
_show_return_values(frame, retval)
Expand Down
Loading
Loading