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

Xtrigger sequence fix #3285

Merged
merged 10 commits into from
Aug 15, 2019
Merged

Conversation

hjoliver
Copy link
Member

@hjoliver hjoliver commented Aug 12, 2019

These changes partially address #3283 (companion PR to master will complete).

Major:

  • record xtrigger functions against cycling sequence, and only use those valid for the sequence when task proxies are instantiated.

Minor:

  • better unifies the handling of clock- and general-xtriggers
  • wall_clock works with positional or keyword offset arg (another problem identified by @trwhitcomb)
  • disallows clock triggers with integer cycling

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).
  • Appropriate tests are included (functional).
  • Appropriate change log entry included.
  • No documentation update required (this just makes xtriggers work as they should).

@hjoliver hjoliver force-pushed the xtrigger-sequence-fix branch 2 times, most recently from 1727f93 to 128c84c Compare August 12, 2019 05:16
@hjoliver hjoliver self-assigned this Aug 12, 2019
@hjoliver hjoliver added the bug label Aug 12, 2019
@hjoliver hjoliver added this to the next-release milestone Aug 12, 2019
@cylc cylc deleted a comment Aug 12, 2019
@cylc cylc deleted a comment Aug 12, 2019
@hjoliver hjoliver marked this pull request as ready for review August 12, 2019 06:26
@cylc cylc deleted a comment Aug 12, 2019
@hjoliver hjoliver mentioned this pull request Aug 12, 2019
6 tasks
Copy link
Contributor

@matthewrmshin matthewrmshin left a comment

Choose a reason for hiding this comment

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

Generally happy with these changes. A few comments on style.

lib/cylc/task_pool.py Show resolved Hide resolved
lib/cylc/config.py Show resolved Hide resolved
lib/cylc/xtrigger_mgr.py Outdated Show resolved Hide resolved
tests/xtriggers/03-sequence.t Show resolved Hide resolved
tests/xtriggers/03-sequence.t Outdated Show resolved Hide resolved
@cylc cylc deleted a comment Aug 13, 2019
@cylc cylc deleted a comment Aug 13, 2019
@cylc cylc deleted a comment Aug 13, 2019
@cylc cylc deleted a comment Aug 14, 2019
@hjoliver
Copy link
Member Author

(rebased)

@cylc cylc deleted a comment Aug 15, 2019
@cylc cylc deleted a comment Aug 15, 2019
Copy link
Member

@dwsutherland dwsutherland left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Ran it on my system, and the xtriggers were on sequence.

(just Travis now)

@matthewrmshin matthewrmshin merged commit 7ecbf99 into cylc:7.8.x Aug 15, 2019
@hjoliver hjoliver deleted the xtrigger-sequence-fix branch August 15, 2019 10:39
@hjoliver
Copy link
Member Author

Thanks @dwsutherland 👍

@hjoliver
Copy link
Member Author

Yay, the 7.8.x test battery passed, unbelievable 😮 (I stole a few fixes from @matthewrmshin's work on master).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants