Skip to content

Commit

Permalink
Merge pull request #6177 from cylc/8.3.x-sync
Browse files Browse the repository at this point in the history
🤖 Merge 8.3.x-sync into master
  • Loading branch information
MetRonnie authored Jun 28, 2024
2 parents 1429325 + 7042afa commit 3fc8a71
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"

[#6067](https://github.com/cylc/cylc-flow/pull/6067) - Fixed a bug that sometimes allowed suicide-triggered or manually removed tasks to be added back later.

[#6109](https://github.com/cylc/cylc-flow/pull/6109) - Fixed bug affecting job submission where the list of bad hosts was not always reset correctly.

[#6123](https://github.com/cylc/cylc-flow/pull/6123) - Allow long-format datetime cycle points in IDs used on the command line.

## __cylc-8.2.7 (Released 2024-05-15)__
Expand Down Expand Up @@ -119,6 +121,8 @@ $ towncrier create <PR-number>.<break|feat|fix>.md --content "Short description"

### 🔧 Fixes

[#5924](https://github.com/cylc/cylc-flow/pull/5924) - Validation: a cycle offset can only appear on the right of a dependency if the task's cycling is defined elsewhere with no offset.

[#5933](https://github.com/cylc/cylc-flow/pull/5933) - Fixed bug in `cylc broadcast` (and the GUI Edit Runtime command) where everything after a `#` character in a setting would be stripped out.

[#5959](https://github.com/cylc/cylc-flow/pull/5959) - Fix an issue where workflow "timeout" events were not fired in all situations when they should have been.
Expand Down
1 change: 1 addition & 0 deletions changes.d/6170.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an issue where the Cylc logo could appear in the workflow log.
1 change: 0 additions & 1 deletion changes.d/fix.5924.md

This file was deleted.

1 change: 0 additions & 1 deletion changes.d/fix.6109.md

This file was deleted.

12 changes: 8 additions & 4 deletions cylc/flow/scheduler_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,12 @@ async def scheduler_cli(
# upgrade the workflow DB (after user has confirmed upgrade)
_upgrade_database(db_file)

# re-execute on another host if required
_distribute(options.host, workflow_id_raw, workflow_id, options.color)

# print the start message
_print_startup_message(options)

# re-execute on another host if required
_distribute(options.host, workflow_id_raw, workflow_id, options.color)

# setup the scheduler
# NOTE: asyncio.run opens an event loop, runs your coro,
# then shutdown async generators and closes the event loop
Expand Down Expand Up @@ -561,10 +561,14 @@ def _upgrade_database(db_file: Path) -> None:


def _print_startup_message(options):
"""Print the Cylc header including the CLI logo."""
"""Print the Cylc header including the CLI logo to the user's terminal."""
if (
cylc.flow.flags.verbosity > -1
and (options.no_detach or options.format == 'plain')
# don't print the startup message on reinvocation (note
# --host=localhost is the best indication we have that reinvokation has
# happened)
and options.host != 'localhost'
):
print(
cparse(
Expand Down

0 comments on commit 3fc8a71

Please sign in to comment.