diff --git a/pyproject.toml b/pyproject.toml index 159203b..3fff7d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ classifiers = [ requires-python = ">=3.8" dependencies = [ "ewokscore >=5.0.0", - "pypushflow >=2.0.0", + "pypushflow >=2.1.0rc1", ] [project.urls] diff --git a/scripts/mapreduce_workflow.py b/scripts/mapreduce_workflow.py index df76535..14c2436 100644 --- a/scripts/mapreduce_workflow.py +++ b/scripts/mapreduce_workflow.py @@ -166,5 +166,5 @@ def run(self): pool_type="process", # thread, process, gevent scaling_workers=False, max_workers=16, - raise_error=True, + raise_on_error=True, ) diff --git a/src/ewoksppf/bindings.py b/src/ewoksppf/bindings.py index d43394d..4e9e6cd 100644 --- a/src/ewoksppf/bindings.py +++ b/src/ewoksppf/bindings.py @@ -154,9 +154,7 @@ def _conditions_fulfilled(self, inData: dict) -> bool: return True def _execute(self, inData: dict, _scope_id: Optional[str] = None) -> None: - self.setStarted() trigger = self._conditions_fulfilled(inData) - self.setFinished() if trigger: for actor in self.listDownStreamActor: actor.trigger(inData) @@ -264,11 +262,7 @@ def _execute( source: Optional[AbstractActor] = None, ) -> None: with self._lock: - self.setStarted() - try: - self._cache_inputs(source, inData) - finally: - self.setFinished() + self._cache_inputs(source, inData) if not self._has_all_required_triggers(): return