Skip to content

Bypass callback on cancel #815

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

Closed
liamhuber wants to merge 1 commit into from
Closed

Bypass callback on cancel #815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions pyiron_workflow/mixin/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,20 +338,19 @@ def _finish_run(
"""
Switch the status, then process and return the run result.
"""
if isinstance(run_output, Future) and run_output.cancelled():
return None

self.running = False
try:
if isinstance(run_output, Future):
# when the future is chancelled nothing happens
if run_output.cancelled():
return None
run_output = run_output.result()
self.future = None
if unique_executor:
unique_executor.shutdown(wait=False)
del unique_executor
self.running = False
return self.process_run_result(run_output)
except Exception as e:
self.running = False
self._run_exception(**run_exception_kwargs)
if raise_run_exceptions:
raise e
Expand Down
Loading