Skip to content

Commit 493f4c5

Browse files
authored
fix: prevent removed plans from being used in workflow commands (#2998)
1 parent 753d037 commit 493f4c5

File tree

11 files changed

+1025
-867
lines changed

11 files changed

+1025
-867
lines changed

docs/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,8 @@
349349
nitpick_ignore = [
350350
("py:class", "CommandResult"),
351351
("py:class", "CommunicationCallback"),
352+
("py:class", "datetime"),
353+
("py:class", "DiGraph"),
352354
("py:class", "DynamicProxy"),
353355
("py:class", "IActivityGateway"),
354356
("py:class", "IClientDispatcher"),

docs/reference/core.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,14 @@ Workflows
158158
:members:
159159
:show-inheritance:
160160

161+
.. automodule:: renku.core.workflow.plan
162+
:members:
163+
:show-inheritance:
164+
165+
.. automodule:: renku.core.workflow.execute
166+
:members:
167+
:show-inheritance:
168+
161169
.. automodule:: renku.core.workflow.concrete_execution_graph
162170
:members:
163171
:show-inheritance:

docs/spelling_wordlist.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ Subclass
209209
subclasses
210210
Subclasses
211211
subcommand
212+
subcommands
212213
subdirectories
213214
subdirectory
214215
subfolder
@@ -218,6 +219,7 @@ Subgraph
218219
submodule
219220
submodules
220221
subpath
222+
subprocesses
221223
substep
222224
substeps
223225
substring

renku/command/rerun.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
from typing import List, Optional
2121

2222
from renku.command.command_builder.command import Command, inject
23-
from renku.command.workflow import execute_workflow
2423
from renku.core import errors
2524
from renku.core.interface.activity_gateway import IActivityGateway
2625
from renku.core.interface.client_dispatcher import IClientDispatcher
2726
from renku.core.util.os import get_relative_paths
2827
from renku.core.workflow.activity import get_activities_until_paths, sort_activities
2928
from renku.core.workflow.concrete_execution_graph import ExecutionGraph
29+
from renku.core.workflow.execute import execute_workflow_graph
3030

3131

3232
def rerun_command():
@@ -77,4 +77,4 @@ def _rerun(
7777
return activities, set(sources)
7878

7979
graph = ExecutionGraph([a.plan_with_values for a in activities], virtual_links=True)
80-
execute_workflow(dag=graph.workflow_graph, provider=provider, config=config)
80+
execute_workflow_graph(dag=graph.workflow_graph, provider=provider, config=config)

renku/command/update.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
from renku.command.command_builder import inject
2424
from renku.command.command_builder.command import Command
25-
from renku.command.workflow import execute_workflow
2625
from renku.core import errors
2726
from renku.core.errors import ParameterError
2827
from renku.core.interface.client_dispatcher import IClientDispatcher
@@ -34,6 +33,7 @@
3433
sort_activities,
3534
)
3635
from renku.core.workflow.concrete_execution_graph import ExecutionGraph
36+
from renku.core.workflow.execute import execute_workflow_graph
3737

3838

3939
def update_command():
@@ -81,4 +81,4 @@ def _update(
8181
return activities, modified_paths
8282

8383
graph = ExecutionGraph([a.plan_with_values for a in activities], virtual_links=True)
84-
execute_workflow(dag=graph.workflow_graph, provider=provider, config=config)
84+
execute_workflow_graph(dag=graph.workflow_graph, provider=provider, config=config)

0 commit comments

Comments
 (0)