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

Fix.do not allow multiple templating sections #133

Merged

Conversation

wxtim
Copy link
Member

@wxtim wxtim commented Apr 5, 2022

These changes close #124

Synopsis

Cylc Rose was checking for [empy:suite.rc] and [jinja2:suite.rc] both being set, but was not checking whether either was being set with [template variables].

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 setup.cfg.
  • Appropriate tests are included (unit and/or functional).
  • Appropriate change log entry included.
  • No documentation update required.

Other

Tagging @dpmatthews for a functional review as he raised this bug. IMO this only requires 1 full review +1 manual test.

@wxtim wxtim self-assigned this Apr 5, 2022
@wxtim wxtim requested a review from MetRonnie April 5, 2022 09:56
@wxtim wxtim added bug Something isn't working small labels Apr 5, 2022
@wxtim wxtim added this to the 1.0.3 milestone Apr 5, 2022
@wxtim wxtim marked this pull request as draft April 5, 2022 10:15
@wxtim wxtim marked this pull request as ready for review April 5, 2022 10:16
@wxtim wxtim marked this pull request as draft April 5, 2022 10:17
@wxtim wxtim marked this pull request as ready for review April 5, 2022 10:20
@wxtim
Copy link
Member Author

wxtim commented Apr 5, 2022

Failing tests - marked draft TL I get back from my walk.

@wxtim wxtim marked this pull request as draft April 5, 2022 10:23
@wxtim wxtim marked this pull request as ready for review April 5, 2022 13:22
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

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

Have manually tested cylc graph, install, play

One thing, the change from string to "constant" (now-reverted in 189b670) wasn't a bad idea, considering how vulnerable strings are to typos

@wxtim
Copy link
Member Author

wxtim commented Apr 5, 2022

Have manually tested cylc graph, install, play

One thing, the change from string to "constant" (now-reverted in 189b670) wasn't a bad idea, considering how vulnerable strings are to typos

I agree, however it was making tests fail, so I was going to do it separately and work out what the problem is.

There are a lot of code style things I did a year ago that I don't like about this repo, of which this is not the biggest...

@wxtim wxtim merged commit 5d72591 into cylc:master Apr 7, 2022
@wxtim wxtim deleted the fix.do_not_allow_multiple_templating_sections branch April 7, 2022 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

what happens if [jinja2:suite.rc] and [template variables] are both set.
2 participants