🤖 Merge 1.3.x-sync into master #315
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
delete unwanted opts after post install step. * Removed test because it duplicated test_no_rose_suite_conf_in_devdir * added test to confim that post instlall removes Rose settings from opts objects. * lower pin cylc version for this fix (requires cylc-flow change) * unset ROSE_SUITE_OPT_CONF_KEYS --------- Co-authored-by: Ronnie Dutta <[email protected]> Co-authored-by: Oliver Sanders <[email protected]>
github-actions
bot
added
the
sync
* upstream/master: (47 commits) simplify rose stem tests (#314) Apply suggestions from code review add developer docs build(deps): bump pypa/gh-action-pypi-publish from 1.8.11 to 1.8.14 (#301) [skip ci] tests: remove defunct cli wrappers (#297) tests/functional: fix scoping issues setup: add missing pytest-asyncio test dependency install/reinstall: adapt to new async interfaces tests: fix flaky text fileinstall: remove asyncio logic Bump codecov/codecov-action from 3 to 4 (#295) use fqdn in rose-stem tests (#294) Update setup.cfg setup: bump rose version fix merge mistake fix flake8 fixed a test Apply suggestions from code review Bump actions/setup-python from 4 to 5 (#280) Update tests/functional/test_utils.py ...
wxtim
reviewed
May 2, 2024
|
I think that I have the key changes from my branches. Please can I ask you to review. |
oliver-sanders
approved these changes
May 9, 2024
MetRonnie
approved these changes
May 9, 2024
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.
Please do a normal merge, not squash merge.
Please fix conflicts if necessary.
Triggered by
push