From 2ec7cd8e2adaaddcdf72c11cdadf625c2b95a52f Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Fri, 22 May 2026 21:05:13 -0600 Subject: [PATCH 1/5] Add missing journal/colors/*.cfg files to installation. --- pythia/Makefile.am | 2 +- pythia/journal/devices/Console.py | 3 ++- setup.cfg | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pythia/Makefile.am b/pythia/Makefile.am index 57cdf9b1..a2f15df8 100644 --- a/pythia/Makefile.am +++ b/pythia/Makefile.am @@ -48,9 +48,9 @@ EXTRA_DIST = \ journal/colors/__init__.py \ journal/colors/__vault__.odb \ journal/colors/dark-bg.odb \ + journal/colors/dark-bg.cfg \ journal/colors/light-bg.odb \ journal/colors/light-bg.cfg \ - journal/colors/dark-bg.cfg \ journal/colors/none.odb \ journal/components/Channel.py \ journal/components/ChannelFacility.py \ diff --git a/pythia/journal/devices/Console.py b/pythia/journal/devices/Console.py index 85ea7197..061b07cf 100644 --- a/pythia/journal/devices/Console.py +++ b/pythia/journal/devices/Console.py @@ -21,7 +21,8 @@ class Console(Device): def _write(self, text): for line in text: print(line) - + import sys + sys.stdout.flush() return diff --git a/setup.cfg b/setup.cfg index 509efc04..1af4e4fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,6 +37,8 @@ pythia.pyre = schedulers/scripts/*/*.odb pythia.mpi = launchers/*.odb +pythia.journal = + colors/*.cfg pythia.blade = toolkits/*.odb toolkits/*/*.odb From 78d04c3f70988e7e23d58721ab84ef1a662fb7dd Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Fri, 22 May 2026 21:06:32 -0600 Subject: [PATCH 2/5] Set color of journal source information to be similar to background. --- pythia/journal/colors/dark-bg.cfg | 10 +++++----- pythia/journal/colors/light-bg.cfg | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pythia/journal/colors/dark-bg.cfg b/pythia/journal/colors/dark-bg.cfg index c9d69821..6cab5d51 100644 --- a/pythia/journal/colors/dark-bg.cfg +++ b/pythia/journal/colors/dark-bg.cfg @@ -10,12 +10,12 @@ [dark-bg] -filename = LightGreen -line = LightGreen -function = LightPurple -src = Yellow +filename = DarkGray +line = DarkGray +function = DarkGray +src = DarkGray -facility = LightBlue +facility = LightPurple severity-debug = LightCyan severity-info = LightGreen severity-error = LightRed diff --git a/pythia/journal/colors/light-bg.cfg b/pythia/journal/colors/light-bg.cfg index be7971bb..6c6b1d61 100644 --- a/pythia/journal/colors/light-bg.cfg +++ b/pythia/journal/colors/light-bg.cfg @@ -10,12 +10,12 @@ [light-bg] -filename = Green -line = Green -function = Purple -src = Red +filename = LightGray +line = LightGray +function = LightGray +src = LightGray -facility = Blue +facility = Purple severity-debug = Cyan severity-info = Green severity-error = Red From 6dfdccfea3556f3f05cdcbb2c2fdf9ae1aeee32c Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Fri, 22 May 2026 21:06:55 -0600 Subject: [PATCH 3/5] Add _flow journal channel with name 'application-flow'. --- pythia/pyre/inventory/Configurable.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pythia/pyre/inventory/Configurable.py b/pythia/pyre/inventory/Configurable.py index f642c481..96244ec4 100644 --- a/pythia/pyre/inventory/Configurable.py +++ b/pythia/pyre/inventory/Configurable.py @@ -324,6 +324,7 @@ def __init__(self, name=None): self._info = info(name) self._error = error(name) self._warning = warning(name) + self._flow = info("application-flow") # modify the inventory defaults that were hardwired at compile time # gives derived components an opportunity to modify their default behavior From 134861739160512b195e925079bb395fee33c808 Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Sat, 23 May 2026 13:41:16 -0600 Subject: [PATCH 4/5] Update journal header to be severity (channel)' which matches new Pyre. --- pythia/journal/components/Renderer.py | 2 +- tests/pytests/journal/test_facilities.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pythia/journal/components/Renderer.py b/pythia/journal/components/Renderer.py index cb0e1313..5766d916 100644 --- a/pythia/journal/components/Renderer.py +++ b/pythia/journal/components/Renderer.py @@ -23,7 +23,7 @@ class Inventory(Component.Inventory): header = pythia.pyre.inventory.str( "header", - default=" >> %(filename)s:%(line)s:%(function)s\n -- %(facility)s(%(severity)s)") + default=" >> %(filename)s:%(line)s:%(function)s\n -- %(severity)s (%(facility)s)") header.meta['tip'] = "the first line of the generated message" footer = pythia.pyre.inventory.str("footer", default="") diff --git a/tests/pytests/journal/test_facilities.py b/tests/pytests/journal/test_facilities.py index 5ac397ad..20e209ad 100644 --- a/tests/pytests/journal/test_facilities.py +++ b/tests/pytests/journal/test_facilities.py @@ -54,7 +54,7 @@ def test_file(self): logLines = log.readlines() self.assertEqual(4, len(logLines)) iLine = 2 - self.assertEqual("-- debug_on(debug)", logLines[iLine].strip()) + self.assertEqual("-- debug (debug_on)", logLines[iLine].strip()) iLine += 1 self.assertEqual("-- This journal should be on.", logLines[iLine].strip()) os.remove(filename) From 21eb90093c91534b07f69d924a2cef68b37d9185 Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Fri, 22 May 2026 21:08:52 -0600 Subject: [PATCH 5/5] Update m4 --- m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4 b/m4 index 371e0125..1a455e8d 160000 --- a/m4 +++ b/m4 @@ -1 +1 @@ -Subproject commit 371e0125e547aaf204153920dbc64280846e88ae +Subproject commit 1a455e8d0e5f98316f9d50dc9a93e641d8f7df60