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

cylc_lang: permit preprocessing in intercycle offsets #86

Merged

Conversation

oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented Sep 17, 2024

The lexer didn't permit preprocessing inside of inter-cycle offsets.

This caused the examples in cylc/cylc-flow#6349 the be flagged as errors (which would have caused cylc-doc build failures).

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 if present).
  • Tests are included (example of preproc in intercycle offset now in the docs)
  • Changelog entry included - no changelog for this project
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix - no bugfix release branch for this project

@oliver-sanders oliver-sanders added the bug Something isn't working label Sep 17, 2024
@oliver-sanders oliver-sanders added this to the 1.4.3 milestone Sep 17, 2024
@oliver-sanders oliver-sanders self-assigned this Sep 17, 2024
[[graph]]
P1Y = """
@wall_clock => foo? => bar
(foo? & bar) => pub

foo[-{{ duration }}+P1D] => foo
Copy link
Member Author

Choose a reason for hiding this comment

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

This gets run through the lexer when the cylc-sphinx-extensions docs are built. Before this change, this code would have caused a build error.

Try yourself with make html.

@oliver-sanders
Copy link
Member Author

CI error for Python "3" is caused by an incompatibility with the slide builder (hieroglyph) and not this PR.

Sadly, hieroglyph is no longer maintained and we have dropped build support in cylc-doc. I expect we will probably strip it out completely (cylc-doc & cylc-sphinx-extensions) in the future as it doesn't look like the project is going to make a comeback :(

Copy link
Member

@wxtim wxtim left a comment

Choose a reason for hiding this comment

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

I've had a decent go at breaking this.

@oliver-sanders oliver-sanders merged commit b64f9db into cylc:master Sep 26, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants