Merge pull request #322 from sartography/improvement/remove-celery

remove celery task and dependency

SpiffWorkflow/serializer/base.py

@@ -20,7 +20,6 @@
 from ..specs.AcquireMutex import AcquireMutex
 from ..specs.Cancel import Cancel
 from ..specs.CancelTask import CancelTask
-from ..specs.Celery import Celery
 from ..specs.Choose import Choose
 from ..specs.ExclusiveChoice import ExclusiveChoice
 from ..specs.Execute import Execute
@@ -46,7 +45,6 @@ def spec_map():
         'acquire-mutex': AcquireMutex,
         'cancel': Cancel,
         'cancel-task': CancelTask,
-        'celery': Celery,
         'choose': Choose,
         'exclusive-choice': ExclusiveChoice,
         'execute': Execute,

SpiffWorkflow/serializer/dict.py

@@ -24,7 +24,6 @@
 from ..specs.AcquireMutex import AcquireMutex
 from ..specs.Cancel import Cancel
 from ..specs.CancelTask import CancelTask
-from ..specs.Celery import Celery
 from ..specs.Choose import Choose
 from ..specs.ExclusiveChoice import ExclusiveChoice
 from ..specs.Execute import Execute
@@ -204,26 +203,6 @@ def deserialize_cancel_task(self, wf_spec, s_state):
         self.deserialize_task_spec(wf_spec, s_state, spec=spec)
         return spec
 
-    def serialize_celery(self, spec):
-        args = self.serialize_list(spec.args)
-        kwargs = self.serialize_dict(spec.kwargs)
-        s_state = self.serialize_task_spec(spec)
-        s_state['call'] = spec.call
-        s_state['args'] = args
-        s_state['kwargs'] = kwargs
-        s_state['result_key'] = spec.result_key
-        return s_state
-
-    def deserialize_celery(self, wf_spec, s_state):
-        args = self.deserialize_list(s_state['args'])
-        kwargs = self.deserialize_dict(s_state.get('kwargs', {}))
-        spec = Celery(wf_spec, s_state['name'], s_state['call'],
-                      call_args=args,
-                      result_key=s_state['result_key'],
-                      **kwargs)
-        self.deserialize_task_spec(wf_spec, s_state, spec)
-        return spec
-
     def serialize_choose(self, spec):
         s_state = self.serialize_task_spec(spec)
         s_state['context'] = spec.context

SpiffWorkflow/serializer/xml.py

@@ -24,7 +24,6 @@
 from ..specs.AcquireMutex import AcquireMutex
 from ..specs.Cancel import Cancel
 from ..specs.CancelTask import CancelTask
-from ..specs.Celery import Celery
 from ..specs.Choose import Choose
 from ..specs.ExclusiveChoice import ExclusiveChoice
 from ..specs.Execute import Execute
@@ -384,37 +383,6 @@ def serialize_cancel_task(self, spec):
     def deserialize_cancel_task(self, wf_spec, elem, cls=CancelTask, **kwargs):
         return self.deserialize_trigger(wf_spec, elem, cls, **kwargs)
 
-    def serialize_celery(self, spec, elem=None):
-        if elem is None:
-            elem = etree.Element('celery')
-
-        SubElement(elem, 'call').text = spec.call
-        args_elem = SubElement(elem, 'args')
-        self.serialize_value_list(args_elem, spec.args)
-        kwargs_elem = SubElement(elem, 'kwargs')
-        self.serialize_value_map(kwargs_elem, spec.kwargs)
-        if spec.merge_results:
-            SubElement(elem, 'merge-results')
-        SubElement(elem, 'result-key').text = spec.result_key
-
-        return self.serialize_task_spec(spec, elem)
-
-    def deserialize_celery(self, wf_spec, elem, cls=Celery, **kwargs):
-        call = elem.findtext('call')
-        args = self.deserialize_value_list(elem.find('args'))
-        result_key = elem.findtext('call')
-        merge_results = elem.find('merge-results') is not None
-        spec = self.deserialize_task_spec(wf_spec,
-                                          elem,
-                                          cls,
-                                          call=call,
-                                          call_args=args,
-                                          result_key=result_key,
-                                          merge_results=merge_results,
-                                          **kwargs)
-        spec.kwargs = self.deserialize_value_map(elem.find('kwargs'))
-        return spec
-
     def serialize_choose(self, spec, elem=None):
         if elem is None:
             elem = etree.Element('choose')

requirements.txt

@@ -1,6 +1,4 @@
-# Celery locked to 5.2.3 due to https://github.com/celery/celery/issues/7409
 # Can remove this limitation when bug is resolved, or we drop support for python 3.7
-celery==5.2.3
 coverage
 lxml
 .

setup.py

@@ -25,7 +25,7 @@
           'SpiffWorkflow.bpmn.parser': ['schema/*.xsd'],
           'SpiffWorkflow.dmn.parser': ['schema/*.xsd'],
       },
-      install_requires=['configparser', 'lxml', 'celery',
+      install_requires=['configparser', 'lxml',
           # required for python 3.7 - https://stackoverflow.com/a/73932581
           'importlib-metadata<5.0; python_version <= "3.7"'],
       keywords='spiff workflow bpmn engine',