misc rebase

Author: unkcpz

src/plumpy/__init__.py

@@ -29,7 +29,6 @@
 from .futures import CancellableAction, Future, capture_exceptions, create_task
 from .loaders import DefaultObjectLoader, ObjectLoader, get_object_loader, set_object_loader
 from .message import MessageBuilder, ProcessLauncher, create_continue_body, create_launch_body
-from .mixins import ContextMixin
 from .persistence import (
     Bundle,
     InMemoryPersister,
@@ -77,8 +76,6 @@
     'CancellableAction',
     # exceptions
     'ClosedError',
-    # mixins
-    'ContextMixin',
     # process_states/States
     'Continue',
     # coordinator

src/plumpy/mixins.py

@@ -42,9 +42,8 @@
     auto_load,
     auto_persist,
     auto_save,
-    ensure_object_loader,
 )
-from .utils import SAVED_STATE_TYPE
+from .utils import SAVED_STATE_TYPE, ensure_coroutine
 
 __all__ = [
     'Continue',
@@ -312,7 +311,7 @@ def recreate_from(cls, saved_state: SAVED_STATE_TYPE, load_context: Optional[Loa
         obj = auto_load(cls, saved_state, load_context)
         obj.process = load_context.process
 
-        obj.run_fn = ensure_coroutine(getattr(self.process, saved_state[self.RUN_FN]))
+        obj.run_fn = ensure_coroutine(getattr(obj.process, saved_state[obj.RUN_FN]))
         if obj.COMMAND in saved_state:
             obj._command = persistence.load(saved_state[obj.COMMAND], load_context)  # type: ignore
 

src/plumpy/process_states.py

@@ -280,7 +280,7 @@ def recreate_from(
         proc._future = persistence.SavableFuture()
         proc._event_helper = EventHelper(ProcessListener)
         proc._logger = None
-        proc._communicator = None
+        proc._coordinator = None
 
         if 'loop' in load_context:
             proc._loop = load_context.loop
@@ -290,7 +290,7 @@ def recreate_from(
         proc._state = proc.recreate_state(saved_state['_state'])
 
         if 'communicator' in load_context:
-            proc._communicator = load_context.communicator
+            proc._coordinator = load_context.coordinator
 
         if 'logger' in load_context:
             proc._logger = load_context.logger

src/plumpy/processes.py

@@ -23,21 +23,18 @@
     cast,
 )
 
-import kiwipy
-
 from plumpy import utils
 from plumpy.base import state_machine
-from plumpy.coordinator import Coordinator
 from plumpy.base.utils import call_with_super_check
+from plumpy.coordinator import Coordinator
 from plumpy.event_helper import EventHelper
 from plumpy.exceptions import InvalidStateError
 from plumpy.persistence import LoadSaveContext, Savable, auto_persist, auto_save, ensure_object_loader
 from plumpy.process_listener import ProcessListener
 
-from . import lang, mixins, persistence, process_spec, process_states, processes
+from . import lang, persistence, process_spec, process_states, processes
 from .utils import PID_TYPE, SAVED_STATE_TYPE, AttributesDict
 
-
 ToContext = dict
 
 PREDICATE_TYPE = Callable[['WorkChain'], bool]
@@ -215,7 +212,7 @@ def recreate_from(
         proc._future = persistence.SavableFuture()
         proc._event_helper = EventHelper(ProcessListener)
         proc._logger = None
-        proc._communicator = None
+        proc._coordinator = None
 
         if 'loop' in load_context:
             proc._loop = load_context.loop
@@ -224,8 +221,8 @@ def recreate_from(
 
         proc._state = proc.recreate_state(saved_state['_state'])
 
-        if 'communicator' in load_context:
-            proc._communicator = load_context.communicator
+        if 'coordinator' in load_context:
+            proc._coordinator = load_context.coordinator
 
         if 'logger' in load_context:
             proc._logger = load_context.logger