Skip to content

Commit 81ce86e

Browse files
authored
feat(core): make toil the default workflow backend (#3220)
1 parent b7b2395 commit 81ce86e

File tree

7 files changed

+76
-105
lines changed

7 files changed

+76
-105
lines changed

poetry.lock

Lines changed: 67 additions & 95 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ sphinx-click = { version = "^4.3.0", optional = true }
136136
sphinx-rtd-theme = { version = "<1.1,>=0.5.0", optional = true }
137137
sphinx-tabs = { version = "==3.2.0", optional = true }
138138
tabulate = ">=0.7.7,<0.8.11"
139-
toil = { version = "==5.7.1", optional = true }
139+
toil = "5.7.1"
140140
tqdm = "<4.62.4,>=4.48.1"
141141
types-python-dateutil = { version="^2.8.10", optional = true }
142142
types-PyYAML = { version="<6.1.0,>=5.4", optional = true }
@@ -205,7 +205,6 @@ tests = [
205205
"types-requests",
206206
"types-tabulate"
207207
]
208-
toil = ["toil"]
209208
docs = ["plantweb", "renku-sphinx-theme", "sphinx-click", "sphinx-rtd-theme", "sphinxcontrib-spelling", "sphinx-tabs"]
210209
all = [
211210
"apispec",

renku/core/plugin/provider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ def available_workflow_providers() -> List[str]:
6969
return [p[1] for p in providers]
7070

7171

72-
def execute(dag: "nx.DiGraph", basedir: Path, config: Dict[str, Any], provider: str = "cwltool") -> List[str]:
72+
def execute(dag: "nx.DiGraph", basedir: Path, config: Dict[str, Any], provider: str = "toil") -> List[str]:
7373
"""Executes a given workflow using the selected provider.
7474
7575
Args:
7676
dag("nx.DiGraph"): The workflow graph to execute.
7777
basedir(Path): The root directory of the renku project.
7878
config(Dict[str, Any]): Configuration values for the workflow provider.
79-
provider(str, optional): The workflow executor engine to be used (Default value = "cwltool").
79+
provider(str, optional): The workflow executor engine to be used (Default value = "toil").
8080
8181
Returns:
8282
List[str]: List of paths that has been modified.

renku/core/workflow/execute.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def execute_workflow_graph(
5252
dag: "DiGraph",
5353
activity_gateway: IActivityGateway,
5454
plan_gateway: IPlanGateway,
55-
provider="cwltool",
55+
provider="toil",
5656
config=None,
5757
workflow_file_plan: Optional[WorkflowFileCompositePlan] = None,
5858
):
@@ -62,7 +62,7 @@ def execute_workflow_graph(
6262
dag(DiGraph): The workflow graph to execute.
6363
activity_gateway(IActivityGateway): The injected activity gateway.
6464
plan_gateway(IPlanGateway): The injected plan gateway.
65-
provider: Provider to run the workflow with (Default value = "cwltool").
65+
provider: Provider to run the workflow with (Default value = "toil").
6666
config: Path to config for the workflow provider (Default value = None).
6767
workflow_file_plan (Optional[WorkflowFileCompositePlan): If passed, a workflow file is executed, so, store
6868
related metadata.

renku/ui/cli/rerun.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"provider",
9797
"-p",
9898
"--provider",
99-
default="cwltool",
99+
default="toil",
100100
show_default=True,
101101
type=click.Choice(Proxy(available_workflow_providers), case_sensitive=False),
102102
help="The workflow engine to use.",

renku/ui/cli/update.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
"provider",
174174
"-p",
175175
"--provider",
176-
default="cwltool",
176+
default="toil",
177177
show_default=True,
178178
type=click.Choice(Proxy(available_workflow_providers), case_sensitive=False),
179179
help="The workflow engine to use.",

renku/ui/cli/workflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ def outputs(ctx, paths):
11351135
"provider",
11361136
"-p",
11371137
"--provider",
1138-
default="cwltool",
1138+
default="toil",
11391139
show_default=True,
11401140
type=click.Choice(Proxy(available_workflow_providers), case_sensitive=False),
11411141
help="The workflow engine to use.",
@@ -1311,7 +1311,7 @@ def visualize(sources, columns, exclude_files, ascii, revision, format, interact
13111311
"provider",
13121312
"-p",
13131313
"--provider",
1314-
default="cwltool",
1314+
default="toil",
13151315
show_default=True,
13161316
type=click.Choice(Proxy(available_workflow_providers), case_sensitive=False),
13171317
help="The workflow engine to use.",

0 commit comments

Comments
 (0)