Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- bagofholding =0.1.9
- bidict =0.23.1
- cloudpickle =3.1.2
- executorlib =1.8.0
- executorlib =1.9.1
- graphviz =9.0.0
- hatchling =1.28.0
- hatch-vcs =0.5.0
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
- bagofholding =0.1.9
- bidict =0.23.1
- cloudpickle =3.1.2
- executorlib =1.8.0
- executorlib =1.9.1
- graphviz =9.0.0
- hatchling =1.28.0
- hatch-vcs =0.5.0
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- bagofholding =0.1.9
- bidict =0.23.1
- cloudpickle =3.1.2
- executorlib =1.8.0
- executorlib =1.9.1
- graphviz =9.0.0
- hatchling =1.28.0
- hatch-vcs =0.5.0
Expand Down
11 changes: 9 additions & 2 deletions pyiron_workflow/mixin/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from __future__ import annotations

import contextlib
import threading
from abc import ABC, abstractmethod
from collections.abc import Callable
from concurrent.futures import Executor as StdLibExecutor
Expand Down Expand Up @@ -344,8 +345,14 @@ def _finish_run(
run_output = run_output.result()
self.future = None
if unique_executor:
unique_executor.shutdown(wait=False)
del unique_executor
# executorlib-1.8.2+ cancels futures on `shutdown`
# To avoid recursively invoking this callback, delay shutdown
# until the callback is complete.
threading.Thread(
target=unique_executor.shutdown,
kwargs={"wait": True},
daemon=True,
).start()
return self.process_run_result(run_output)
except Exception as e:
self._run_exception(**run_exception_kwargs)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [
"bagofholding==0.1.9",
"bidict==0.23.1",
"cloudpickle==3.1.2",
"executorlib==1.8.0",
"executorlib==1.9.1",
"graphviz==0.21",
"pandas==3.0.0",
"pint==0.25",
Expand Down
Loading