Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expand comma separated platform names correctly #4880

Merged

Conversation

wxtim
Copy link
Member

@wxtim wxtim commented May 18, 2022

This is a small change with no associated Issue.

Issue summary:

#4854 did not expand comma separated platform config items in the dense config.

Requirements 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.
  • Appropriate tests are included (unit and/or functional).
  • No change log entry required (direct follow on to Expand [platforms] section; Add warning if a platform name regex matches localhost #4854).
  • No documentation update required.

@wxtim wxtim requested review from datamel and MetRonnie May 18, 2022 12:53
@wxtim wxtim self-assigned this May 18, 2022
@wxtim wxtim added this to the cylc-8.0rc4 milestone May 18, 2022
@MetRonnie
Copy link
Member

MetRonnie commented May 18, 2022

#4860 did not expand comma separated platform config items in the dense config.

Wrong PR? And isn't the problem that it didn't expand in the sparse config?

@wxtim
Copy link
Member Author

wxtim commented May 19, 2022

Wrong PR?

Yes #4854

And isn't the problem that it didn't expand in the sparse config?

The problem is that it expands the sparse config after creating the dense config, and therefore doesn't include that expansion in the dense config.

@wxtim wxtim requested a review from datamel May 19, 2022 07:15
@@ -1493,9 +1493,11 @@ def load(self):
LOG.error(f'bad {conf_type} {fname}')
raise

# Expand platforms needs to be performed first because it
# manipulates the sparse config.
self._expand_platforms()
self._set_default_editors()
Copy link
Member

@MetRonnie MetRonnie May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I think the fact that the dense config is expanded in a method called _set_default_editors() is a bit troublesome. I am addressing this as part of #4815)

Copy link
Contributor

@datamel datamel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked out and tested. Thanks @wxtim.

@datamel datamel merged commit 356af5f into cylc:master May 19, 2022
@MetRonnie
Copy link
Member

May want to add a changelog entry for this as it didn't make it into the same release as #4854

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
  ...
@hjoliver hjoliver modified the milestones: cylc-8.0rc4, cylc-8.0.0 Jul 5, 2022
@wxtim wxtim deleted the expand_comma_separated_platform_names_correctly branch October 10, 2022 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants