Allow platform default directives #4896
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In this case the suggested refactor would IMO make the code less rather than more readable.
wxtim
added
could be better
wxtim
force-pushed
the
allow_platform_default_directives
branch
from
d7d7e51
to
5179e5b
Compare
wxtim
force-pushed
the
allow_platform_default_directives
branch
from
5179e5b
to
bdd609f
Compare
hjoliver
approved these changes
May 25, 2022
MetRonnie
reviewed
May 25, 2022
cylc/flow/cfgspec/globalcfg.py
Outdated
Comment on lines
1317
to
1320
| Job runner (batch scheduler) directives. | ||
|
|
||
| Default directives for :cylc:conf: | ||
| `flow.cylc[runtime][<namespace>][directives]` |
There was a problem hiding this comment.
Looks like the precedent for this kind of thing is
Suggested change
| Job runner (batch scheduler) directives. | |
| Default directives for :cylc:conf: | |
| `flow.cylc[runtime][<namespace>][directives]` | |
| :Defaults for: :cylc:conf:`flow.cylc[runtime][<namespace>][directives]` |
(avoiding duplicating the description)
There was a problem hiding this comment.
Sorry, Dave and I have had a discussion about this, which we've not documented, but we have it in mind to go through all these cases: I think the agreement was that there should be:
- A headline description [both]
- A fuller description [only one config]
- A link to the other conifg [both]
Is that the conclusion you remember @dpmatthews
There was a problem hiding this comment.
Fair enough, in that case
Suggested change
| Job runner (batch scheduler) directives. | |
| Default directives for :cylc:conf: | |
| `flow.cylc[runtime][<namespace>][directives]` | |
| :Defaults for: :cylc:conf:`flow.cylc[runtime][<namespace>][directives]` | |
| Job runner (batch scheduler) directives. |
:Defaults for: is some kind of sphinx directive by the look of it, possibly from cylc-sphinx-extensions
MetRonnie
reviewed
May 25, 2022
wxtim
commented
May 25, 2022
| @@ -1299,7 1299,9 @@ def get_job_conf( | |||
| itask.platform['job runner command template'] | |||
| ), | |||
| 'dependencies': itask.state.get_resolved_dependencies(), | |||
| 'directives': rtconfig['directives'], | |||
| 'directives': { | |||
There was a problem hiding this comment.
@MetRonnie - I knew there should be a 1-line for this!
Co-authored-by: Ronnie Dutta <61982285 [email protected]>
wxtim
force-pushed
the
allow_platform_default_directives
branch
from
229858c
to
fc67717
Compare
MetRonnie
requested changes
May 26, 2022
Co-authored-by: Ronnie Dutta <61982285 [email protected]>
|
(Functional test failures due to Codecov upload failures) |
MetRonnie
approved these changes
May 27, 2022
wxtim
added a commit
to wxtim/cylc
that referenced
this pull request
May 27, 2022
* 'master' of https://github.com/cylc/cylc: (47 commits) Global platform default directives (cylc#4896) Raise an error if the user tries to set owner. (cylc#4860) Raise error if there is a relative path in `global.cylc[install]source dirs` (cylc#4887) Added a noqa tag to a new flake8-simplify case. (cylc#4895) Update change log. Don't prompt to clean no workflows. Bump to next dev version Fix task matching bug (cylc#4881) Expand comma separated platform names correctly (cylc#4880) resolvers: add a couple of comments Prepare release 8.0rc3 Fix change log. Add & amalgamate jinja2 error tests shellcheck fix Tweak show help text. Fix wrong context lines for jinja2 error Fix missing context lines for jinja2 error Improve new func. test. Syntax highlighting: don't symlink files now they are extracted using cylc get-resources Emacs syntax highlighting: fix filename pattern matching ...
wxtim
added a commit
to wxtim/cylc
that referenced
this pull request
May 27, 2022
Allow setting of default batch system directives in the platform config
wxtim
added a commit
to wxtim/cylc
that referenced
this pull request
May 27, 2022
* upstream/master: Global platform default directives (cylc#4896)
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a change with no associated Issue.
The issue
Cylc 7 allowed the setting of default job runner (batch system) directives using [test battery][batch systems][SYSTEM][directives].
Allow the setting of default directives in Cylc 8.
Requirements check-list
CONTRIBUTING.mdand added my name as a Code Contributor.setup.cfgandconda-environment.yml.globalcfg.py