Skip to content

Commit 4968de0

Browse files
wxtimwxtim
authored
Merge pull request #377 from oliver-sanders/universal-id
universal id
2 parents 9ad7516 + 07c82a2 commit 4968de0

24 files changed

+247
-254
lines changed

‎src/7-to-8/caveats.rst‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ have not yet been (re)implemented.
88
Cylc Flow
99
---------
1010

11-
CLI Change
12-
We plan to move to a new way of specifying workflow, cycles, tasks and jobs
13-
on the command line (with back support for the old format).
14-
15-
This will allow targetting of multiple workflows with a single command e.g::
16-
17-
$ cylc stop '*' # stop everything
18-
19-
* https://github.com/cylc/cylc-flow/pull/3931
2011
Trigger Edit
2112
Functionality removed pending reimplementation.
2213

‎src/7-to-8/cheat-sheet.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Restart a stopped workflow and pick up where it left off:
115115
# optionally reinstall
116116
cylc reinstall <name>
117117

118-
# restart
118+
# restart
119119
cylc play <name>
120120

121121
Deleting

‎src/7-to-8/summary.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Before upgrade, Cylc 8 can run Cylc 7 workflows out of the box. The old
7171
from scratch at the right cycle point or task(s):
7272

7373
- ``cylc play --start-cycle-point=<CYCLEPOINT>`` (c.f. Cylc 7 *warm start*), or
74-
- ``cylc play --start-task=<TASKNAME.CYCLEPOINT>`` (Cylc 8 can start anywhere in the graph)
74+
- ``cylc play --start-task=<CYCLEPOINT/TASKNAME>`` (Cylc 8 can start anywhere in the graph)
7575

7676
Any previous-cycle workflow data needed by the new run will need to be
7777
manually copied over from the original run directory.

‎src/glossary.rst‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -227,27 +227,27 @@ Glossary
227227
subgraph cluster_1 {
228228
label = "2000-01-01T00:00Z"
229229
style = dashed
230-
"foo.01T00" [label="foo\n2000-01-01T00:00Z"]
231-
"bar.01T00" [label="bar\n2000-01-01T00:00Z"]
232-
"baz.01T00" [label="baz\n2000-01-01T00:00Z"]
230+
"01T00/foo" [label="foo\n2000-01-01T00:00Z"]
231+
"01T00/bar" [label="bar\n2000-01-01T00:00Z"]
232+
"01T00/baz" [label="baz\n2000-01-01T00:00Z"]
233233
}
234234

235235
subgraph cluster_2 {
236236
label = "2000-01-01T12:00Z"
237237
style = dashed
238-
"baz.01T12" [label="baz\n2000-01-01T12:00Z"]
238+
"b01T12/az" [label="baz\n2000-01-01T12:00Z"]
239239
}
240240

241241
subgraph cluster_3 {
242242
label = "2000-01-02T00:00Z"
243243
style = dashed
244-
"foo.02T00" [label="foo\n2000-01-02T00:00Z"]
245-
"bar.02T00" [label="bar\n2000-01-02T00:00Z"]
246-
"baz.02T00" [label="baz\n2000-01-02T00:00Z"]
244+
"02T00/foo" [label="foo\n2000-01-02T00:00Z"]
245+
"02T00/bar" [label="bar\n2000-01-02T00:00Z"]
246+
"02T00/baz" [label="baz\n2000-01-02T00:00Z"]
247247
}
248248

249-
"foo.01T00" -> "bar.01T00"
250-
"foo.02T00" -> "bar.02T00"
249+
"01T00/foo" -> "01T00/bar"
250+
"02T00/foo" -> "02T00/bar"
251251

252252

253253
graph string
@@ -290,31 +290,31 @@ Glossary
290290
subgraph cluster_1 {
291291
label = "1"
292292
style = dashed
293-
"foo.1" [label="foo\n1"]
294-
"bar.1" [label="bar\n1"]
295-
"baz.1" [label="baz\n1"]
293+
"1/foo" [label="foo\n1"]
294+
"1/bar" [label="bar\n1"]
295+
"1/baz" [label="baz\n1"]
296296
}
297297

298298
subgraph cluster_2 {
299299
label = "2"
300300
style = dashed
301-
"foo.2" [label="foo\n2"]
302-
"bar.2" [label="bar\n2"]
303-
"baz.2" [label="baz\n2"]
301+
"2/foo" [label="foo\n2"]
302+
"2/bar" [label="bar\n2"]
303+
"2/baz" [label="baz\n2"]
304304
}
305305

306306
subgraph cluster_3 {
307307
label = "3"
308308
style = dashed
309-
"foo.3" [label="foo\n3"]
310-
"bar.3" [label="bar\n3"]
311-
"baz.3" [label="baz\n3"]
309+
"3/foo" [label="foo\n3"]
310+
"3/bar" [label="bar\n3"]
311+
"3/baz" [label="baz\n3"]
312312
}
313313

314-
"foo.1" -> "bar.1" -> "baz.1"
315-
"foo.2" -> "bar.2" -> "baz.2"
316-
"foo.3" -> "bar.3" -> "baz.3"
317-
"bar.1" -> "bar.2" -> "bar.3"
314+
"1/foo" -> "1/bar" -> "1/baz"
315+
"2/foo" -> "2/bar" -> "2/baz"
316+
"3/foo" -> "3/bar" -> "3/baz"
317+
"1/bar" -> "2/bar" -> "3/bar"
318318

319319

320320

@@ -521,31 +521,31 @@ Glossary
521521
subgraph cluster_1 {
522522
label = "1"
523523
style = dashed
524-
"foo.1" [label="foo\n1"]
525-
"bar.1" [label="bar\n1"]
526-
"baz.1" [label="baz\n1"]
524+
"1/foo" [label="foo\n1"]
525+
"1/bar" [label="bar\n1"]
526+
"1/baz" [label="baz\n1"]
527527
}
528528

529529
subgraph cluster_2 {
530530
label = "2"
531531
style = dashed
532-
"foo.2" [label="foo\n2"]
533-
"bar.2" [label="bar\n2"]
534-
"baz.2" [label="baz\n2"]
532+
"2/foo" [label="foo\n2"]
533+
"2/bar" [label="bar\n2"]
534+
"2/baz" [label="baz\n2"]
535535
}
536536

537537
subgraph cluster_3 {
538538
label = "3"
539539
style = dashed
540-
"foo.3" [label="foo\n3"]
541-
"bar.3" [label="bar\n3"]
542-
"baz.3" [label="baz\n3"]
540+
"3/foo" [label="foo\n3"]
541+
"3/bar" [label="bar\n3"]
542+
"3/baz" [label="baz\n3"]
543543
}
544544

545-
"foo.1" -> "bar.1" -> "baz.1"
546-
"foo.2" -> "bar.2" -> "baz.2"
547-
"foo.3" -> "bar.3" -> "baz.3"
548-
"bar.1" -> "bar.2" -> "bar.3"
545+
"1/foo" -> "1/bar" -> "1/baz"
546+
"2/foo" -> "2/bar" -> "2/baz"
547+
"3/foo" -> "3/bar" -> "3/baz"
548+
"1/bar" -> "2/bar" -> "3/bar"
549549

550550

551551
qualifier
@@ -569,8 +569,8 @@ Glossary
569569
A future trigger makes one task depend on another with a later
570570
:term:`cycle point`.
571571

572-
Here, ``bar.1`` triggers off ``foo.2``; and ``bar.2`` off of
573-
``foo.3``; and so on:
572+
Here, ``1/bar`` triggers off ``2/foo``; and ``2/bar`` off of
573+
``3/foo``; and so on:
574574

575575
.. code-block:: cylc
576576

‎src/tutorial/img/cylc-graph-reversible.svg‎

Lines changed: 20 additions & 20 deletions
Loading

‎src/tutorial/runtime/configuration-consolidation/families.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,20 @@ Families and ``cylc graph``
200200

201201
subgraph cluster_1 {
202202
label = "Grouped"
203-
"foo.1" [label="foo"]
204-
"BAR.1" [label="BAR", shape="doubleoctagon"]
203+
"1/foo" [label="foo"]
204+
"1/BAR" [label="BAR", shape="doubleoctagon"]
205205
}
206206

207207
subgraph cluster_2 {
208208
label = "Un-Grouped"
209-
"foo.2" [label="foo"]
210-
"bar.2" [label="bar"]
211-
"baz.2" [label="baz"]
209+
"2/foo" [label="foo"]
210+
"2/bar" [label="bar"]
211+
"2/baz" [label="baz"]
212212
}
213213

214-
"foo.1" -> "BAR.1"
215-
"foo.2" -> "bar.2"
216-
"foo.2" -> "baz.2"
214+
"1/foo" -> "1/BAR"
215+
"2/foo" -> "2/bar"
216+
"2/foo" -> "2/baz"
217217

218218
.. nextslide::
219219

‎src/tutorial/runtime/runtime-configuration.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,22 +211,22 @@ Start, Stop, Restart
211211
.. code-block:: bash
212212
213213
# Run the workflow "name".
214-
cylc play <name>
214+
cylc play <id>
215215
# Stop the workflow "name", killing any running tasks.
216-
cylc stop <name> --kill
216+
cylc stop <id> --kill
217217
# Restart the workflow "name", picking up where it left off.
218-
cylc play <name>
218+
cylc play <id>
219219
220220
.. ifslides::
221221

222222
.. code-block:: sub
223223
224-
cylc play <name>
225-
cylc stop <name>
226-
cylc play <name>
224+
cylc play <id>
225+
cylc stop <id>
226+
cylc play <id>
227227
228-
cylc stop <name> --kill
229-
cylc stop <name> --now --now
228+
cylc stop <id> --kill
229+
cylc stop <id> --now --now
230230
231231
.. nextslide::
232232

‎src/tutorial/scheduling/datetime-cycling.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,22 +196,22 @@ might produce different results for the recurrences.
196196

197197
size = "3,3"
198198

199-
"foo.1" [label="foo\n2000-01-01T00"]
200-
"foo.2" [label="foo\n2000-01-02T00"]
201-
"foo.3" [label="foo\n2000-01-03T00"]
199+
"1/foo" [label="foo\n2000-01-01T00"]
200+
"2/foo" [label="foo\n2000-01-02T00"]
201+
"3/foo" [label="foo\n2000-01-03T00"]
202202

203-
"foo.1" -> "foo.2" -> "foo.3"
203+
"1/foo" -> "2/foo" -> "3/foo"
204204

205205
- .. digraph:: Example
206206
:align: center
207207

208208
size = "3,3"
209209

210-
"foo.1" [label="foo\n2000-01-01T12"]
211-
"foo.2" [label="foo\n2000-01-02T12"]
212-
"foo.3" [label="foo\n2000-01-03T12"]
210+
"1/foo" [label="foo\n2000-01-01T12"]
211+
"2/foo" [label="foo\n2000-01-02T12"]
212+
"3/foo" [label="foo\n2000-01-03T12"]
213213

214-
"foo.1" -> "foo.2" -> "foo.3"
214+
"1/foo" -> "2/foo" -> "3/foo"
215215

216216
.. nextslide::
217217

0 commit comments

Comments
 (0)