meerschaum 2.3.2__py3-none-any.whl → 2.3.4__py3-none-any.whl

meerschaum/_internal/entry.py

@@ -111,25 +111,60 @@ def entry(
                 )
 
         entry_success, entry_msg = entry_with_args(_patch_args=_patch_args, **args)
-        if not entry_success:
-            return entry_success, entry_msg
-
         results.append((entry_success, entry_msg))
 
+        if not entry_success:
+            break
+
     success = all(_success for _success, _ in results)
-    msg = (
-        results[0][1]
-        if len(results) == 1
-        else 'Successfully completed steps:\n\n' + '\n'.join(
-            [
-                (
-                    make_header(shlex.join(_sysargs))
-                    + '\n    ' + _msg + '\n'
+    any_success = any(_success for _success, _ in results)
+    success_messages = [_msg for _success, _msg in results if _success]
+
+    successes_msg = (
+        success_messages[0]
+        if len(success_messages) and len(results) == 1
+        else (
+            (
+                'Successfully c'
+                if success
+                else (
+                    'Failed pipeline after '
+                    + f"{len(success_messages)} step"
+                    + ('s' if len(success_messages) != 1 else '')
+                    + '.\n\nC'
                 )
-                for i, ((_, _msg), _sysargs) in enumerate(zip(results, chained_sysargs))
-            ]
+            ) + 'ompleted step'
+                + ('s' if len(success_messages) != 1 else '') 
+            + ':\n\n'
+            + '\n'.join(
+                [
+                    (
+                        make_header(shlex.join(_sysargs))
+                        + '\n    ' + _msg + '\n'
+                    )
+                    for i, (_msg, _sysargs) in enumerate(zip(success_messages, chained_sysargs))
+                ]
+            )
         )
     )
+    has_fail = results[-1][0] is False
+    fail_ix = len(results) - 1
+    fail_sysargs = chained_sysargs[fail_ix] if has_fail else None
+    fail_msg = results[-1][1] if has_fail else ''
+    fails_msg = (
+        'Failed to complete step:\n\n'
+        + make_header(shlex.join(fail_sysargs))
+        + '\n    '
+        + fail_msg
+
+    ) if not results[-1][0] else ''
+
+    msg = (
+        successes_msg
+        + ('\n\n' if any_success else '')
+        + fails_msg
+    ).rstrip() if len(chained_sysargs) > 1 else results[0][1]
+
     if _systemd_result_path:
         import json
         with open(_systemd_result_path, 'w+', encoding='utf-8') as f:

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.3.2"
+__version__ = "2.3.4"

meerschaum/jobs/__init__.py

@@ -57,6 +57,8 @@ def get_jobs(
     A dictionary mapping job names to jobs.
     """
     from meerschaum.connectors.parse import parse_executor_keys
+    executor_keys = executor_keys or get_executor_keys_from_context()
+
     include_local_and_system = (
         combine_local_and_systemd
         and str(executor_keys).split(':', maxsplit=1)[0] in ('None', 'local', 'systemd')

meerschaum/utils/formatting/__init__.py

@@ -265,10 +265,10 @@ def print_tuple(
 
     if common_only:
         skip_common = False
-        do_print = tup[1] in omit_messages
+        do_print = tup[1].strip() in omit_messages
 
     if skip_common:
-        do_print = tup[1] not in omit_messages
+        do_print = tup[1].strip() not in omit_messages
 
     if not do_print:
         return

{meerschaum-2.3.2.dist-info → meerschaum-2.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.3.2
+Version: 2.3.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.3.2.dist-info → meerschaum-2.3.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meerschaum/__init__.py,sha256=6bn5zz7VInDP4fE_FGBMzJYrM6rQhBMJNQqsf1pU7eI,1701
 meerschaum/__main__.py,sha256=r5UjYxH1WA6dGG9YGBPul5xOdgF3Iwl0X4dWDtXU-30,2646
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
-meerschaum/_internal/entry.py,sha256=psQ6zltjBk-9663jT_JiYq34qr6Izk7oLoLCBayYjK8,10125
+meerschaum/_internal/entry.py,sha256=w8RfHyHA3r91e1eree2jgzM35DyNCsooPHbRToUyihQ,11251
 meerschaum/_internal/arguments/__init__.py,sha256=CbNgnlH6fqNI5n7EuQC6m3Do6ckXDqw4Vuc4T_qPJGQ,566
 meerschaum/_internal/arguments/_parse_arguments.py,sha256=6Tf9xTXZA-wH51Ep_iuG5JFLzD2rYevuA8n69FTi6Mk,12984
 meerschaum/_internal/arguments/_parser.py,sha256=LfiVDTr1akj5D31qpJAAXKxMcnLQiD3jRpZtvvHWrAo,14917
@@ -140,7 +140,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=FngJT1BF6959BwyIxw5aYINdEHg4LRf7Wpv2OjrU3nE,71
+meerschaum/config/_version.py,sha256=XKSByS8zjtvnkECcwbvdLuPTiErr9JxpeBtmYCUpBow,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=Yt7GNzC_hz7iUDZ4gVho_lugJO2DnXgnMtsMG_ReoRg,9114
@@ -202,7 +202,7 @@ meerschaum/core/User/_User.py,sha256=CApB7Y0QJL6S9QOCCfrG4SbPuPXJ9AsAYQ5pASMP_Aw
 meerschaum/core/User/__init__.py,sha256=lJ7beIZTG9sO4dAi3367fFBl17dXYEWHKi7HoaPlDyk,193
 meerschaum/jobs/_Executor.py,sha256=qM62BhFTM4tyJ7p90KOM0y3qyeRY9k3ZV_aTDJMHnO8,1682
 meerschaum/jobs/_Job.py,sha256=leyW98wPQUJwvF68zL4vSScalpy6v-e9CiDynoI6aPk,31056
-meerschaum/jobs/__init__.py,sha256=iM-2rEqxVMVZxwYQYsMPDx1wpJs9Lb4xQcguKCI6okU,11899
+meerschaum/jobs/__init__.py,sha256=ieruFbPxozkgyYMEO5wWQ4OXqfD5Pw9VtFWGub6DQxs,11970
 meerschaum/jobs/systemd.py,sha256=H1hdUh7QJs-DSZ7-jEYZ0NLNEplWmyFo2zt2LAsZO9M,24147
 meerschaum/plugins/_Plugin.py,sha256=p6j39tm-xrZENBq-eGtixBuXxLLddtEKWRCRFNqpRu0,34086
 meerschaum/plugins/__init__.py,sha256=trMQ53qgP7ikJhhV_uXzqJw6X1NDz2rPOGXFk40bb1Y,26190
@@ -231,7 +231,7 @@ meerschaum/utils/daemon/__init__.py,sha256=o9jWb4lRTIyny4EPt7fPXFgV_vIf1mUofsTwo
 meerschaum/utils/daemon/_names.py,sha256=d2ZwTxBoTAqXZkCfZ5LuX2XrkQmLNUq1OTlUqfoH5dA,4515
 meerschaum/utils/dtypes/__init__.py,sha256=JR9PViJTzhukZhq0QoPIs73HOnXZZr8OmfhAAD4OAUA,6261
 meerschaum/utils/dtypes/sql.py,sha256=IkEOyB63je-rCLHM6WwFzGbCerYk1zobL1cXkWqmTa4,14638
-meerschaum/utils/formatting/__init__.py,sha256=NcNPxXRSnKZAIBxAD0ictCjVBzYzFtOwpf2CDMfr4_Y,15354
+meerschaum/utils/formatting/__init__.py,sha256=GLx3fvTQi7EnC9fo31WggpMRpmR7yTWIuZmHdZgqvuM,15370
 meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
 meerschaum/utils/formatting/_pipes.py,sha256=wy0iWJFsFl3X2VloaiA_gp9Yx9w6tD3FQZvAQAqef4A,19492
 meerschaum/utils/formatting/_pprint.py,sha256=tgrT3FyGyu5CWJYysqK3kX1xdZYorlbOk9fcU_vt9Qg,3096
@@ -241,11 +241,11 @@ meerschaum/utils/packages/_packages.py,sha256=GzbJ0kxW_EQogXmY4vguRkUyad42cshFs7
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=bLAWnllKDuE_z6bLk7gLh4mI3Sp1j5hsboTqPKOQq84,24361
-meerschaum-2.3.2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.3.2.dist-info/METADATA,sha256=eHBptbYlyLDmNHOsptNJbIO2MrmtPUAXw3YxEhtUD6U,24006
-meerschaum-2.3.2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.3.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-meerschaum-2.3.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.3.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.3.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.3.2.dist-info/RECORD,,
+meerschaum-2.3.4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.3.4.dist-info/METADATA,sha256=-89HxsENgXRrBNIu7NCvAXSbWHx_B4QnORjeGqk_tRk,24006
+meerschaum-2.3.4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.3.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+meerschaum-2.3.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.3.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.3.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.3.4.dist-info/RECORD,,