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

🤖 Merge 1.4.x-sync into master #347

Merged
merged 9 commits into from
Nov 8, 2024
Merged

🤖 Merge 1.4.x-sync into master #347

merged 9 commits into from
Nov 8, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 7, 2024

Important

Please do a normal merge, not squash merge.

Please fix conflicts if necessary.


Triggered by push

ensure that vr picks up installed config.

* Update pyproject.toml
* don't display warnings about ROSE_ORIG_HOST when not relevant
* updated lower pin on cylc version
* de-flake test, unrelated to PR
* updated test for Python 3.7

---------

Co-authored-by: Oliver Sanders <oliver.sanders@metoffice.gov.uk>
@github-actions github-actions bot added the sync PR for synchronising changes between *.*.x and master label Nov 7, 2024
Workflow: Release stage 1 - create release PR, run: 42
@oliver-sanders
Copy link
Member

Tests failing, probably need the cylc-flow sync PR before passing.

oliver-sanders and others added 5 commits November 7, 2024 16:02
Workflow: Release stage 2 - auto publish, run: 57
…_handling_of_Jinja2_error

Fix test broken by Cylc 8.4 better handling of Jinja2 error
@wxtim
Copy link
Member

wxtim commented Nov 8, 2024

Additional problem - cylc/cylc-flow#6289 broke one of the new tests which was reliant on the old output format. (I'm actually surprised that change hasn't broken a load of the tests in tests/functional/06*/flow.cylc)

I tried raising it as a PR, but the CI was unable to run, because the cylc-admin version system couldn't cope with the 1.4.x-sync branch name, so I've merged it to this PR. We can always revert if necessary.

However, because I've now modified this branch @oliver-sanders and @MetRonnie ought both review. I've dismissed my review.

@wxtim wxtim requested review from wxtim and MetRonnie November 8, 2024 09:01
@oliver-sanders oliver-sanders merged commit 1b7e97d into master Nov 8, 2024
9 checks passed
@oliver-sanders oliver-sanders deleted the 1.4.x-sync branch November 8, 2024 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sync PR for synchronising changes between *.*.x and master
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants