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

Fix cylc show satisfied xtriggers info #5780

Merged

Conversation

dwsutherland
Copy link
Member

closes #5683

image

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).
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@dwsutherland dwsutherland added bug Something is wrong :( small labels Oct 20, 2023
@dwsutherland dwsutherland added this to the cylc-8.2.3 milestone Oct 20, 2023
@dwsutherland dwsutherland self-assigned this Oct 20, 2023
@MetRonnie MetRonnie linked an issue Oct 20, 2023 that may be closed by this pull request
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.

Looks reasonable, and seems to work.

I wonder if Oliver's new test framework in #5731 might allow us to test it. I might have a play - since that'll help with this and be good reviewing of that PR>

Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

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

Tested, working. Might be useful to add a type annotation here

--- a/cylc/flow/data_store_mgr.py
+++ b/cylc/flow/data_store_mgr.py
@@ -482,5 +484,5 @@ class DataStoreMgr:
             for state in TASK_STATUSES_ORDERED
         }
-        self.xtrigger_tasks = {}
+        self.xtrigger_tasks: Dict[str, Set[Tuple[str, str]]] = {}
         # Managed data types
         self.data = {

@oliver-sanders
Copy link
Member

I wonder if Oliver's new test framework in #5731 might allow us to test it

That's just for Tui and at present Tui doesn't support cylc show.

Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

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

Looks good, but might as well add the suggested type annotation @dwsutherland

@dwsutherland
Copy link
Member Author

Might be useful to add a type annotation here

Done.

@oliver-sanders oliver-sanders merged commit 1af0470 into cylc:8.2.x Oct 24, 2023
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :( small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cylc show does not show xtrigger information for satisfied xtriggers
5 participants