From fe207fd736967a0da39757028bcdb6a7acd7aec1 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 16:38:43 +0100 Subject: [PATCH 1/6] tui: supress scan errors --- cylc/flow/tui/updater.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cylc/flow/tui/updater.py b/cylc/flow/tui/updater.py index 84ad7e786b..83a2924c3b 100644 --- a/cylc/flow/tui/updater.py +++ b/cylc/flow/tui/updater.py @@ -230,7 +230,8 @@ async def _update(self): # do a workflow scan if it's due update_start_time = time() if update_start_time - last_scan_time > self.BASE_SCAN_INTERVAL: - data = await self._scan() + with suppress(Exception): + data = await self._scan() # get the next snapshot from workflows we are subscribed to update = await self._run_update(data) From 630c8a6b4f5042abd35e03d5612fdd86a8aecd1b Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 17:16:50 +0100 Subject: [PATCH 2/6] tui: get the updater to continue no matter what --- cylc/flow/tui/updater.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cylc/flow/tui/updater.py b/cylc/flow/tui/updater.py index 83a2924c3b..dbc1baef77 100644 --- a/cylc/flow/tui/updater.py +++ b/cylc/flow/tui/updater.py @@ -184,10 +184,11 @@ async def run(self, filters): with suppress_logging(): self._update_filters(filters) while True: - ret = await self._update() - if ret == self.SIGNAL_TERMINATE: - break - self.update_queue.put(ret) + with suppress(Exception): + ret = await self._update() + if ret == self.SIGNAL_TERMINATE: + break + self.update_queue.put(ret) def _subscribe(self, w_id): if w_id not in self._clients: From 6cf1ace64271f4d51980f87a62216e4eb5302e46 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 17:22:58 +0100 Subject: [PATCH 3/6] dummy commit --- cylc/flow/tui/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cylc/flow/tui/__init__.py b/cylc/flow/tui/__init__.py index 6beaeae059..4c8134fbe4 100644 --- a/cylc/flow/tui/__init__.py +++ b/cylc/flow/tui/__init__.py @@ -27,6 +27,8 @@ TASK_STATUS_SUCCEEDED ) +DUMMY_VAL = 0 + TUI = """ _,@@@@@@. <=@@@, `@@@@@. From e75571d63c8df8bc45f12be1e5a7d69ff6fb87c0 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 17:27:12 +0100 Subject: [PATCH 4/6] dummy commit --- cylc/flow/tui/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/tui/__init__.py b/cylc/flow/tui/__init__.py index 4c8134fbe4..e264af71d5 100644 --- a/cylc/flow/tui/__init__.py +++ b/cylc/flow/tui/__init__.py @@ -27,7 +27,7 @@ TASK_STATUS_SUCCEEDED ) -DUMMY_VAL = 0 +DUMMY_VAL = 1 TUI = """ _,@@@@@@. From 917dfe6bb8add4cb80d4b693e3ec9a33a97e4fb1 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 17:31:46 +0100 Subject: [PATCH 5/6] actions: add two more mac os tests --- .github/workflows/test_fast.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_fast.yml b/.github/workflows/test_fast.yml index dd65adc5e5..33adae1c07 100644 --- a/.github/workflows/test_fast.yml +++ b/.github/workflows/test_fast.yml @@ -26,6 +26,10 @@ jobs: python-version: '3.7' - os: 'macos-latest' python-version: '3.9' # oldest supported version + - os: 'macos-latest' + python-version: '3.10' + - os: 'macos-latest' + python-version: '3.11' # non-utc timezone test - os: 'ubuntu-latest' python-version: '3.9' # not the oldest, not the most recent version From 0b274f05d714e776a4a593e9d5b053a00de3fe2d Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Mon, 21 Oct 2024 17:31:53 +0100 Subject: [PATCH 6/6] dummy commit --- cylc/flow/tui/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/tui/__init__.py b/cylc/flow/tui/__init__.py index e264af71d5..1210e1d2db 100644 --- a/cylc/flow/tui/__init__.py +++ b/cylc/flow/tui/__init__.py @@ -27,7 +27,7 @@ TASK_STATUS_SUCCEEDED ) -DUMMY_VAL = 1 +DUMMY_VAL = 2 TUI = """ _,@@@@@@.