Author: Michael R. Crusoe <crusoe@debian.org>
Description: Allow newer cwltool version
Forwarded: not-needed
Origin: upstream, https://github.com/DataBiosphere/toil/pull/4206/commits/77848382612f07443786ec7aa9b7347ddf1c9f86

cwltool.expression move to cwl-utils (this was already fixed upstream)

--- toil.orig/src/toil/cwl/cwltoil.py
+++ toil/src/toil/cwl/cwltoil.py
@@ -59,7 +59,7 @@
 import cwltool.command_line_tool
 import cwltool.context
 import cwltool.errors
-import cwltool.expression
+import cwl_utils.expression
 import cwltool.load_tool
 import cwltool.main
 import cwltool.provenance
@@ -240,7 +240,7 @@
         if self.expression is None:
             return False
 
-        expr_is_true = cwltool.expression.do_eval(
+        expr_is_true = cwl_utils.expression.do_eval(
             self.expression,
             {shortname(k): v for k, v in resolve_dict_w_promises(job).items()},
             self.requirements,
@@ -489,7 +489,7 @@
         :param inputs:
         :return: object
         """
-        return cwltool.expression.do_eval(
+        return cwl_utils.expression.do_eval(
             self.expr,
             inputs,
             self.req,
@@ -2430,7 +2430,7 @@
 
             def valueFromFunc(k: str, v: Any) -> Any:
                 if k in valueFrom:
-                    return cwltool.expression.do_eval(
+                    return cwl_utils.expression.do_eval(
                         valueFrom[k],
                         shortio,
                         self.step.requirements,
