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.

Sign up for GitHub

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

Jump to bottom

Trigger and set: fix default flow assignment for n=0 tasks. #6367

Merged
merged 17 commits into from
Oct 15, 2024
Merged

Trigger and set: fix default flow assignment for n=0 tasks. #6367

merged 17 commits into from
Oct 15, 2024

Conversation

hjoliver
Copy link
Member

@hjoliver hjoliver commented Sep 11, 2024 •
edited
Loading

Close #6361

FIX

  • by default (i.e., --flow option not used), existing (n=0) tasks should keep their existing flow numbers

Tidy

  • remove redundant option checking, now done during command validation
  • clarify command and schema help

NEW

  • explicit use of --flow will merge the given flow numbers into existing (n=0) tasks
    (this seems sensible to me, and I can't think of a reason not to do it)

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 (or explain why tests are not needed).
  • Changelog entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@hjoliver hjoliver added this to the 8.3.4 milestone Sep 11, 2024
@hjoliver hjoliver requested a review from MetRonnie September 11, 2024 07:46
@hjoliver hjoliver self-assigned this Sep 11, 2024
@hjoliver hjoliver force-pushed the fix-trigger-flow-bug branch 6 times, most recently from d7178d3 to 29ddf4f Compare September 11, 2024 08:11
@oliver-sanders oliver-sanders modified the milestones: 8.3.4, 8.3.5 Sep 11, 2024
@hjoliver hjoliver changed the base branch from master to 8.3.x September 17, 2024 22:05
@hjoliver hjoliver force-pushed the fix-trigger-flow-bug branch from 29ddf4f to a95ee30 Compare September 17, 2024 22:12
@hjoliver hjoliver force-pushed the fix-trigger-flow-bug branch from a95ee30 to 2eb2e63 Compare September 17, 2024 22:18
@hjoliver hjoliver added the bug Something is wrong :( label Sep 17, 2024
@hjoliver hjoliver marked this pull request as ready for review September 18, 2024 05:03
@oliver-sanders oliver-sanders self-requested a review September 18, 2024 12:50
MetRonnie
MetRonnie requested changes Sep 25, 2024
View reviewed changes
changes.d/6367.fix.md Outdated Show resolved Hide resolved
cylc/flow/network/schema.py Outdated Show resolved Hide resolved
cylc/flow/scripts/trigger.py Outdated Show resolved Hide resolved
cylc/flow/scripts/trigger.py Outdated Show resolved Hide resolved
cylc/flow/scripts/trigger.py Outdated Show resolved Hide resolved
cylc/flow/task_pool.py Outdated Show resolved Hide resolved
tests/integration/test_data_store_mgr.py Outdated Show resolved Hide resolved
cylc/flow/task_pool.py Outdated Show resolved Hide resolved
@MetRonnie MetRonnie mentioned this pull request Sep 25, 2024
Merged
hjoliver and others added 3 commits September 30, 2024 16:46
@hjoliver
Merge pull request #56 from MetRonnie/flow-opts-amend
50206bf 
Simplify flow number wrangling & improve error message
@hjoliver @MetRonnie
Update tests/integration/test_data_store_mgr.py
61ec89f 
Co-authored-by: Ronnie Dutta <[email protected]>
@hjoliver
Tweaks.
f586f82
@hjoliver

This comment was marked as resolved.

Sign in to view
@oliver-sanders

This comment was marked as resolved.

Sign in to view
@oliver-sanders oliver-sanders marked this pull request as draft September 30, 2024 15:41
@hjoliver hjoliver marked this pull request as ready for review October 1, 2024 09:29
@hjoliver
Copy link
Member Author

hjoliver commented Oct 1, 2024

This should be good to go now. A bunch of new tests added.

@hjoliver hjoliver requested a review from MetRonnie October 1, 2024 09:39
oliver-sanders
oliver-sanders approved these changes Oct 7, 2024
View reviewed changes
cylc/flow/network/schema.py Show resolved Hide resolved
cylc/flow/scripts/trigger.py Outdated Show resolved Hide resolved
@MetRonnie MetRonnie mentioned this pull request Oct 14, 2024
Merged
@hjoliver
Copy link
Member Author

Merged your test tweaks @MetRonnie, tests all passing, should be good to merge now.

@MetRonnie MetRonnie merged commit e1741c5 into cylc:8.3.x Oct 15, 2024
27 checks passed
@oliver-sanders oliver-sanders mentioned this pull request Oct 15, 2024
Closed
@hjoliver hjoliver deleted the fix-trigger-flow-bug branch October 15, 2024 22:35
@oliver-sanders
Copy link
Member

@hjoliver

Can you take a look at #5635 in the light of this PR as it is probably fixed.

@oliver-sanders oliver-sanders mentioned this pull request Oct 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliver-sanders oliver-sanders oliver-sanders approved these changes

@MetRonnie MetRonnie MetRonnie approved these changes

Assignees

@hjoliver hjoliver

Labels
bug Something is wrong :(
Projects
None yet
Milestone
8.3.5
Development

Successfully merging this pull request may close these issues.

Errant flow merge when triggering
3 participants
@hjoliver @oliver-sanders @MetRonnie