`cylc vr` #5229

wxtim · 2022-11-16T15:53:21Z

Closes #3896

Branch based upon a rebase of #5214 onto #5121, which it has now replaced.

~~Depending on what Reviewers thing it may replace #5214 once #5121 has been merged.~~

Purpose

Check List

I have read CONTRIBUTING.md and added my name as a Code Contributor.
Contains logically grouped changes (else tidy your branch by rebase).
Does not contain off-topic changes (use other PRs for other changes).
Applied any dependency changes to both setup.cfg and conda-environment.yml.
Tests are included (or explain why tests are not needed).
CHANGES.md entry included if this is a change that can affect users
Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

Validation against source for installed workflows.

…pt_at_get_tvars

Co-authored-by: Oliver Sanders <[email protected]>

Co-authored-by: Oliver Sanders <[email protected]> simplify integration tests, writing proper test harness fixtures response to review

Co-authored-by: Oliver Sanders <[email protected]>

cylc/flow/scripts/reinstall.py

cylc/flow/scripts/validate_reinstall.py

cylc/flow/scripts/view.py

Co-authored-by: Oliver Sanders <[email protected]>

oliver-sanders

Empty file tests/unit/scripts/test_validate.py?

tests/integration/utils/flow_tools.py

tests/integration/test_get_old_tvars.py

tests/integration/scripts/test_validate_integration.py

tests/integration/conftest.py

tests/functional/cylc-combination-scripts/02-vr-restart.t

tests/functional/cylc-combination-scripts/01-vr-reload.t

cylc/flow/workflow_files.py

cylc/flow/scripts/view.py

CHANGES.md

MetRonnie

From testing out:

When doing cylc vr on a stopped workflow, there is no indication that the workflow is now running

$ cylc vr temp4
  $ cylc validate --against-source temp4/run1
  Valid for cylc-8.1.0.dev
  $ cylc reinstall temp4/run1
  REINSTALL temp4/run1 from ~/cylc-src/temp4
  temp4/run1 up to date with ~/cylc-src/temp4

cylc vr --no-detach is missing the timestamps - not a biggie so probably address later

wxtim · 2023-01-11T13:48:48Z

* When doing `cylc vr` on a stopped workflow, there is no indication that the workflow is now running
  ```
  $ cylc vr temp4
    $ cylc validate --against-source temp4/run1
    Valid for cylc-8.1.0.dev
    $ cylc reinstall temp4/run1
    REINSTALL temp4/run1 from ~/cylc-src/temp4
    temp4/run1 up to date with ~/cylc-src/temp4
  ```

This is the output from Cylc reinstall saying there's nothing to be reinstalled. Having had a quick chat with @MetRonnie I've added a warning, which seems a bit much, until you realize that this scenario produces a non-zero return code from vr.

MetRonnie

LGTM

oliver-sanders · 2023-01-11T15:40:05Z

cylc/flow/scripts/validate_reinstall.py

+            source='',  # Intentionally blank
+        )
+        log_subcommand('play', workflow_id)
+        scheduler_cli(options, workflow_id)


I think we might need a return 0 at the end of this method?

Actually I think this is fine, turns out sys.exit(None) is equivalent to sys.exit(0).

oliver-sanders

🎉 Nice!

wxtim self-assigned this Nov 16, 2022

wxtim added this to the cylc-8.1.0 milestone Nov 16, 2022

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch 2 times, most recently from 15e056e to 66e4b2d Compare November 17, 2022 11:17

wxtim changed the title ~~Implement cylc vro~~ cylc vro Nov 17, 2022

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from 9534b52 to 3483102 Compare November 17, 2022 11:56

Get Template Vars from database for played workflows.

f01657f

Validation against source for installed workflows.

wxtim requested review from MetRonnie and datamel November 28, 2022 15:26

wxtim marked this pull request as draft November 28, 2022 15:26

wxtim and others added 3 commits November 30, 2022 09:07

Merge branch 'master' into 20221031T1340--HEAD--=master--second_attem…

a3c3ac4

…pt_at_get_tvars

clean integration test

757098e

Update cylc/flow/option_parsers.py

2bd5da8

Co-authored-by: Oliver Sanders <[email protected]>

wxtim closed this Dec 1, 2022

wxtim deleted the 20221116T1324--vip&getTvars--implement_VRO branch December 1, 2022 13:15

wxtim restored the 20221116T1324--vip&getTvars--implement_VRO branch December 5, 2022 16:37

wxtim and others added 4 commits December 6, 2022 13:06

Update tests/integration/conftest.py

3603496

Co-authored-by: Oliver Sanders <[email protected]> simplify integration tests, writing proper test harness fixtures response to review

Update CHANGES.md

bb857d2

Co-authored-by: Oliver Sanders <[email protected]>

prevent 'against_source' being a valid Cylc VIP option.

5d89fdc

remove unwated run-mod option

b224a6a

wxtim reopened this Dec 13, 2022

oliver-sanders requested review from oliver-sanders and removed request for MetRonnie December 13, 2022 15:39

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from a0068e7 to 86acb05 Compare December 14, 2022 09:41

wxtim marked this pull request as ready for review December 14, 2022 09:41

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch 2 times, most recently from 108ee54 to 6fc3ca3 Compare December 14, 2022 11:19

add Cylc VRO

4ce97a2

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from 6fc3ca3 to 4ce97a2 Compare December 14, 2022 16:02

fix broken test

e4eff9c

oliver-sanders reviewed Jan 9, 2023

View reviewed changes

cylc/flow/scripts/reinstall.py Show resolved Hide resolved

oliver-sanders reviewed Jan 10, 2023

View reviewed changes

Update cylc/flow/scripts/view.py

a620f92

Co-authored-by: Oliver Sanders <[email protected]>

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from 914701e to a620f92 Compare January 10, 2023 13:39

wxtim requested a review from oliver-sanders January 10, 2023 13:39

oliver-sanders reviewed Jan 10, 2023

View reviewed changes

wxtim requested a review from oliver-sanders January 10, 2023 13:51

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from 65690e7 to b24d54e Compare January 10, 2023 15:41

response to review

7f7a716

wxtim force-pushed the 20221116T1324--vip&getTvars--implement_VRO branch from b24d54e to 7f7a716 Compare January 10, 2023 15:53

de-flake a test

ee83acd

MetRonnie changed the title ~~cylc vro~~ cylc vr Jan 11, 2023

MetRonnie requested changes Jan 11, 2023

View reviewed changes

CHANGES.md Outdated Show resolved Hide resolved

wxtim commented Jan 11, 2023

View reviewed changes

CHANGES.md Show resolved Hide resolved

Update CHANGES.md

4a07bf9

wxtim commented Jan 11, 2023

View reviewed changes

CHANGES.md Show resolved Hide resolved

Update CHANGES.md

735f39a

wxtim requested a review from MetRonnie January 11, 2023 12:52

MetRonnie reviewed Jan 11, 2023

View reviewed changes

CHANGES.md Outdated Show resolved Hide resolved

MetRonnie reviewed Jan 11, 2023

View reviewed changes

response to review

a870bdb

wxtim requested a review from MetRonnie January 11, 2023 13:50

MetRonnie approved these changes Jan 11, 2023

View reviewed changes

MetRonnie linked an issue Jan 11, 2023 that may be closed by this pull request

config: template variables specified to play should be loaded #4740

Closed

oliver-sanders reviewed Jan 11, 2023

View reviewed changes

oliver-sanders approved these changes Jan 11, 2023

View reviewed changes

oliver-sanders merged commit 7d62959 into cylc:master Jan 11, 2023

wxtim deleted the 20221116T1324--vip&getTvars--implement_VRO branch January 12, 2023 09:52

MetRonnie mentioned this pull request Jan 12, 2023

Restrict --set & --set-file options in cylc vr #5297

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`cylc vr` #5229

`cylc vr` #5229

wxtim commented Nov 16, 2022 •

edited by oliver-sanders

Loading

oliver-sanders left a comment •

edited

Loading

MetRonnie left a comment •

edited

Loading

wxtim commented Jan 11, 2023

MetRonnie left a comment

oliver-sanders Jan 11, 2023

oliver-sanders Jan 11, 2023

oliver-sanders left a comment

cylc vr #5229

cylc vr #5229

Conversation

wxtim commented Nov 16, 2022 • edited by oliver-sanders Loading

Purpose

oliver-sanders left a comment • edited Loading

Choose a reason for hiding this comment

MetRonnie left a comment • edited Loading

Choose a reason for hiding this comment

wxtim commented Jan 11, 2023

MetRonnie left a comment

Choose a reason for hiding this comment

oliver-sanders Jan 11, 2023

Choose a reason for hiding this comment

oliver-sanders Jan 11, 2023

Choose a reason for hiding this comment

oliver-sanders left a comment

Choose a reason for hiding this comment

`cylc vr` #5229

`cylc vr` #5229

wxtim commented Nov 16, 2022 •

edited by oliver-sanders

Loading

oliver-sanders left a comment •

edited

Loading

MetRonnie left a comment •

edited

Loading