Skip to content

expression-refactor 2026 refresh #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mr-c wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

expression-refactor 2026 refresh #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0687784
Revert "expression refactor: always set the ID for ExpressionTools"
mr-c Aug 17, 2026
b00b1d2
expr refactor: set ID for created workflows
mr-c Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/cwl_utils/cwl_v1_0_expression_refactor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -294,6 +293,7 @@ def traverse(
run=copy.deepcopy(process),
)
workflow = cwl.Workflow(
id=process.id,
inputs=wf_inputs,
outputs=wf_outputs,
steps=[step],
Expand Down Expand Up @@ -409,7 +409,6 @@ def generate_etool_from_expr(
else None
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down Expand Up @@ -1732,7 +1731,6 @@ def generate_etool_from_expr2(
}"""
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down
4 changes: 1 addition & 3 deletions src/cwl_utils/cwl_v1_1_expression_refactor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -294,6 +293,7 @@ def traverse(
run=copy.deepcopy(process),
)
workflow = cwl.Workflow(
id=process.id,
inputs=wf_inputs,
outputs=wf_outputs,
steps=[step],
Expand Down Expand Up @@ -407,7 +407,6 @@ def generate_etool_from_expr(
else None
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down Expand Up @@ -1738,7 +1737,6 @@ def generate_etool_from_expr2(
}"""
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down
4 changes: 1 addition & 3 deletions src/cwl_utils/cwl_v1_2_expression_refactor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -295,6 +294,7 @@ def traverse(
run=copy.deepcopy(process),
)
workflow = cwl.Workflow(
id=process.id,
inputs=wf_inputs,
outputs=wf_outputs,
steps=[step],
Expand Down Expand Up @@ -408,7 +408,6 @@ def generate_etool_from_expr(
else None
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down Expand Up @@ -1851,7 +1850,6 @@ def generate_etool_from_expr2(
}"""
)
return cwl.ExpressionTool(
id="_:" + str(uuid.uuid4()),
inputs=inputs,
outputs=outputs,
expression=expression,
Expand Down