Skip to content

Commit 347efa1

Browse files
authored
Merge pull request #800 from MetRonnie/cylc-set
Cherry-pick `cylc set` corrections
2 parents 857be00 + aceaa92 commit 347efa1

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

src/reference/changes.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ Cylc 8.2
328328
.. admonition:: Cylc Components
329329
:class: hint
330330

331-
:cylc-flow: `8.2 <https://github.com/cylc/cylc-flow/blob/8.2.x/CHANGES.md>`__
332-
:cylc-uiserver: `1.4 <https://github.com/cylc/cylc-uiserver/blob/1.4.x/CHANGES.md>`__
333-
:cylc-rose: `1.3 <https://github.com/cylc/cylc-rose/blob/1.3.x/CHANGES.md>`__
331+
:cylc-flow: `8.2 <https://github.com/cylc/cylc-flow/blob/8.2.7/CHANGES.md>`__
332+
:cylc-uiserver: `1.4 <https://github.com/cylc/cylc-uiserver/blob/1.4.4/CHANGES.md>`__
333+
:cylc-rose: `1.3 <https://github.com/cylc/cylc-rose/blob/1.3.4/CHANGES.md>`__
334334

335335

336336
UI now remembers workspace tab layout
@@ -400,9 +400,9 @@ Cylc 8.1
400400
.. admonition:: Cylc Components
401401
:class: hint
402402

403-
:cylc-flow: `8.1 <https://github.com/cylc/cylc-flow/blob/master/CHANGES.md#cylc-814-released-2023-05-04>`__
404-
:cylc-uiserver: `1.2 <https://github.com/cylc/cylc-uiserver/blob/1.2.x/CHANGES.md>`__
405-
:cylc-rose: `1.1 <https://github.com/cylc/cylc-rose/blob/1.1.0/CHANGES.md#user-content-cylc-rose-110-released-2022-07-28>`__
403+
:cylc-flow: `8.1 <https://github.com/cylc/cylc-flow/blob/8.1.4/CHANGES.md>`__
404+
:cylc-uiserver: `1.2 <https://github.com/cylc/cylc-uiserver/blob/1.2.2/CHANGES.md>`__
405+
:cylc-rose: `1.1 <https://github.com/cylc/cylc-rose/blob/1.1.1/CHANGES.md>`__
406406

407407
.. warning::
408408

src/user-guide/cheat-sheet.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ First, make your required changes to the files in the workflow's
132132
cylc vr <id>
133133

134134
If you want to quickly edit a task's configuration, e.g. while developing a
135-
workflow or testing changes, the
135+
workflow or testing changes, the
136136
:ref:`"Edit Runtime" feature <interventions.edit-a-tasks-configuration>`
137137
in the GUI can be convenient.
138138

@@ -218,7 +218,7 @@ Run or re-run a task (:ref:`more info <interventions.re-run-a-task>`)::
218218

219219
cylc trigger <id>//<cycle>/<task>
220220

221-
Mark a task as "succeeded"
221+
Mark a task as complete
222222
(:ref:`more info <interventions.set-task-outputs>`)::
223223

224224
cylc set <id>//<cycle>/<task>

src/user-guide/interventions/index.rst

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,21 @@ Set Task Outputs
165165
.. image:: set-task-outputs.gui.gif
166166
:width: 75%
167167

168-
By default this sets the "succeeded" output, press the pencil icon next
169-
to the trigger command to specify a different output.
168+
By default, this sets all :term:`required outputs <required output>` for
169+
the task, which usually includes ``succeeded``.
170+
To specify the output(s) you would like to set,
171+
press the pencil icon next to the "Set" command .
170172

171173
.. tab-item:: Tui
172174
:sync: tui
173175

174176
.. image:: set-task-outputs.tui.gif
175177
:width: 75%
176178

177-
By default, this sets the "succeeded" output. Use ``cylc set --output``
178-
to specify a different output.
179+
By default, this sets all :term:`required outputs <required output>` for
180+
the task, which usually includes ``succeeded``.
181+
To specify the output(s) you would like to set,
182+
use ``cylc set --output``.
179183

180184
.. tab-item:: CLI
181185
:sync: cli
@@ -184,8 +188,10 @@ Set Task Outputs
184188
185189
$ cylc set <workflow>//<task>
186190
187-
By default, this sets the "succeeded" output. Use the ``--output`` option
188-
to specify a different output.
191+
By default, this sets all :term:`required outputs <required output>` for
192+
the task, which usually includes ``succeeded``.
193+
To specify the output(s) you would like to set,
194+
use the ``--output`` option.
189195

190196
You can also :ref:`set task prerequisites <interventions.set-task-prerequisites>`.
191197
Should I set task outputs or prerequisites?
@@ -203,7 +209,7 @@ Set Task Prerequisites
203209
204210
[scheduler]
205211
allow implicit tasks = True
206-
212+
207213
[scheduling]
208214
[[graph]]
209215
R1 = """
@@ -214,7 +220,7 @@ Set Task Prerequisites
214220
# set prereqs "1/b2:succeeded" and "1/c:succeeded" on 1/z1
215221
# set prereqs "all" on 1/z2
216222
"""
217-
223+
218224
[runtime]
219225
[[b1]]
220226
script = sleep 600
@@ -274,10 +280,10 @@ Set a Switch Task
274280
switch:normal? => normal
275281
switch:alternate? => alternate
276282
normal | alternate => end
277-
283+
278284
end[-P1] => start
279285
"""
280-
286+
281287
[runtime]
282288
[[start]]
283289
script = """
@@ -298,23 +304,23 @@ Set a Switch Task
298304
take a particular path ahead of time:
299305

300306
.. code-block:: cylc-graph
301-
307+
302308
start => switch
303-
309+
304310
# by default, the workflow follows the "normal" path
305311
switch:normal? => normal
306-
312+
307313
# but it can follow an alternate route if desired
308314
switch:alternate? => alternate
309-
315+
310316
normal | alternate => end
311317
312318
:Solution:
313319
Set "succeeded" as well as the desired output(s) on the task and use the
314320
``-wait`` option. Cylc will follow the desired path when it gets there.
315321

316322
.. note::
317-
323+
318324
We set the "succeeded" output to prevent the task from being re-run when the
319325
flow approaches it.
320326

src/user-guide/running-workflows/retrying-tasks.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ state, with a new clock trigger to handle the configured retry delay.
2626
Aborting a Retry Sequence
2727
-------------------------
2828

29-
To prevent a waiting task from retrying, remove it from the scheduler's
29+
To prevent a task from retrying, remove it from the scheduler's
3030
:term:`active window`. For a task ``3/foo`` in workflow ``brew``:
3131

3232
.. code-block:: console
@@ -45,6 +45,7 @@ sequence, or remove it.
4545
4646
4747
If you want trigger downstream tasks despite ``3/foo`` being removed before it
48-
could succeed, use ``cylc set`` to artificially mark its ``succeeded``
49-
output as complete (and with the ``--flow`` option, to make the :term:`flow`
50-
continue on from there).
48+
could succeed, use ``cylc set`` to artificially mark its
49+
:term:`required outputs <required output>`
50+
as complete (and with the ``--flow`` option, if needed to make a specific
51+
:term:`flow` continue on from there).

0 commit comments

Comments
 (0)