diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml index 5b852057..ce22050a 100644 --- a/.ci_support/environment.yml +++ b/.ci_support/environment.yml @@ -10,5 +10,5 @@ dependencies: - jinja2 =3.1.2 - paramiko =3.2.0 - tqdm =4.65.0 - - pympipool =0.5.4 + - pympipool =0.5.5 - cloudpickle =2.2.1 diff --git a/pysqa/executor/executor.py b/pysqa/executor/executor.py index 836e4de0..c986cf52 100644 --- a/pysqa/executor/executor.py +++ b/pysqa/executor/executor.py @@ -1,9 +1,8 @@ import os import queue -from threading import Thread from concurrent.futures import Future, Executor as FutureExecutor -from pympipool import cancel_items_in_queue +from pympipool import cancel_items_in_queue, RaisingThread from pysqa.executor.helper import ( reload_previous_futures, find_executed_tasks, @@ -34,7 +33,7 @@ def __init__(self, cwd=None, queue_adapter=None, queue_adapter_kwargs=None): command=command, **queue_adapter_kwargs ) - self._process = Thread( + self._process = RaisingThread( target=find_executed_tasks, kwargs={ "future_queue": self._task_queue, diff --git a/setup.py b/setup.py index 18754efb..ff3544be 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ extras_require={ "sge": ['defusedxml==0.7.1'], "remote": ['paramiko==3.2.0', 'tqdm==4.65.0'], - "executor": ['pympipool==0.5.4', 'cloudpickle==2.2.1'], + "executor": ['pympipool==0.5.5', 'cloudpickle==2.2.1'], }, cmdclass=versioneer.get_cmdclass(), entry_points={