diff --git a/src/cwl_utils/cwl_v1_0_expression_refactor.py b/src/cwl_utils/cwl_v1_0_expression_refactor.py index d584224e..854a9f21 100755 --- a/src/cwl_utils/cwl_v1_0_expression_refactor.py +++ b/src/cwl_utils/cwl_v1_0_expression_refactor.py @@ -5,7 +5,6 @@ import copy import hashlib -import uuid from collections.abc import MutableSequence, Sequence from contextlib import suppress from typing import Any, cast, Final @@ -294,6 +293,7 @@ def traverse( run=copy.deepcopy(process), ) workflow = cwl.Workflow( + id=process.id, inputs=wf_inputs, outputs=wf_outputs, steps=[step], @@ -409,7 +409,6 @@ def generate_etool_from_expr( else None ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression, @@ -1732,7 +1731,6 @@ def generate_etool_from_expr2( }""" ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression, diff --git a/src/cwl_utils/cwl_v1_1_expression_refactor.py b/src/cwl_utils/cwl_v1_1_expression_refactor.py index 685520e7..fba3babe 100755 --- a/src/cwl_utils/cwl_v1_1_expression_refactor.py +++ b/src/cwl_utils/cwl_v1_1_expression_refactor.py @@ -5,7 +5,6 @@ import copy import hashlib -import uuid from collections.abc import MutableSequence, Sequence from contextlib import suppress from typing import Any, cast, Final @@ -294,6 +293,7 @@ def traverse( run=copy.deepcopy(process), ) workflow = cwl.Workflow( + id=process.id, inputs=wf_inputs, outputs=wf_outputs, steps=[step], @@ -407,7 +407,6 @@ def generate_etool_from_expr( else None ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression, @@ -1738,7 +1737,6 @@ def generate_etool_from_expr2( }""" ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression, diff --git a/src/cwl_utils/cwl_v1_2_expression_refactor.py b/src/cwl_utils/cwl_v1_2_expression_refactor.py index eca589a6..2a4ca6da 100755 --- a/src/cwl_utils/cwl_v1_2_expression_refactor.py +++ b/src/cwl_utils/cwl_v1_2_expression_refactor.py @@ -5,7 +5,6 @@ import copy import hashlib -import uuid from collections.abc import Mapping, MutableSequence, Sequence from contextlib import suppress from typing import Any, cast, Final @@ -295,6 +294,7 @@ def traverse( run=copy.deepcopy(process), ) workflow = cwl.Workflow( + id=process.id, inputs=wf_inputs, outputs=wf_outputs, steps=[step], @@ -408,7 +408,6 @@ def generate_etool_from_expr( else None ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression, @@ -1851,7 +1850,6 @@ def generate_etool_from_expr2( }""" ) return cwl.ExpressionTool( - id="_:" + str(uuid.uuid4()), inputs=inputs, outputs=outputs, expression=expression,