edge-containers-cli 5.4.0__tar.gz → 5.4.1__tar.gz

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 5.4.0
+Version: 5.4.1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/src/edge_containers_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '5.4.0'
-__version_tuple__ = version_tuple = (5, 4, 0)
+__version__ = version = '5.4.1'
+__version_tuple__ = version_tuple = (5, 4, 1)
 
-__commit_id__ = commit_id = 'ge3b4c5ecd'
+__commit_id__ = commit_id = 'g33d7fa33f'

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/src/edge_containers_cli/cmds/commands.py

@@ -19,23 +19,28 @@ class CommandError(Exception):
     pass
 
 
-# The columns of `ec ps` and `ec monitor`, modelled on argocd-monitor's
-# Applications table (github.com/epics-containers/argocd-monitor,
-# src/components/app-table/columns.tsx):
-#   health     - Argo CD health vocabulary: Healthy, Progressing, Degraded,
-#                Suspended, Missing or Unknown, with " (Stopped)" appended
-#                when the service has been stopped with `ec stop`
-#   sync       - Argo CD sync vocabulary: Synced, OutOfSync or Unknown
-#   last sync  - when the last sync operation finished
-#   properties - the service's labels, shown only by `ec ps --wide`
+# The columns of `ec ps` and `ec monitor`, in the same order as
+# argocd-monitor's Applications overview table (github.com/epics-containers/
+# argocd-monitor, src/components/app-table/columns.tsx: name, description,
+# health, sync, namespace, revision, last sync, properties). ec has no
+# namespace column, and maps argocd-monitor's "Target Revision" to
+# "version" and "Properties" (labels) to "properties":
+#   description - the service's free-text description
+#   health      - Argo CD health vocabulary: Healthy, Progressing, Degraded,
+#                 Suspended, Missing or Unknown, with " (Stopped)" appended
+#                 when the service has been stopped with `ec stop`
+#   sync        - Argo CD sync vocabulary: Synced, OutOfSync or Unknown
+#   last sync   - when the last sync operation finished
+#   properties  - the service's labels, shown only by `ec ps --wide`, as
+#                 argocd-monitor's Properties column
 ServicesSchema = polars.Schema(
     {
         "name": polars.String,  # type: ignore
+        "description": polars.String,
         "health": polars.String,
         "sync": polars.String,
         "version": polars.String,
         "last sync": polars.String,
-        "description": polars.String,
         "properties": polars.String,
     }
 )

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/src/edge_containers_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edge-containers-cli
-Version: 5.4.0
+Version: 5.4.1
 Summary: CLI for deploying and managing epics containers IOCs and services
 Author-email: Giles Knap <giles.knap@gmail.com>
 License:                                  Apache License

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/src/edge_containers_cli.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "5.4.0",
+  "tag": "5.4.1",
   "distance": 0,
-  "node": "ge3b4c5ecd2ee1244b6d554c493400f56f11db33f",
+  "node": "g33d7fa33f6f615ce25c4baac26ff7f2c3306598e",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-09-22"

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/tests/test_argocd.py

@@ -500,20 +500,20 @@ def yaml_dump(data) -> str:
 # in properties, argocd.argoproj.io/instance is hidden and the
 # argocd.argoproj.io/ prefix is stripped - all as argocd-monitor does
 PS_EXPECT = (
-    "╭──────────────────┬───────────────────┬───────────┬──────────┬──────────────────────┬─────────────────╮\n"
-    "│ name             │ health            │ sync      │ version  │ last sync            │ description     │\n"
-    "├──────────────────┼───────────────────┼───────────┼──────────┼──────────────────────┼─────────────────┤\n"
-    "│ bl01t-di-cam-01  │ Progressing       │ OutOfSync │ main     │                      │                 │\n"
-    "│ bl01t-ea-test-01 │ Healthy           │ Synced    │ 2024.7.1 │ 2026-09-22T09:03:19Z │ my nice service │\n"
-    "│ bl01t-mo-sim-01  │ Healthy (Stopped) │ Synced    │ 2024.7.2 │ 2026-09-21T14:12:02Z │                 │\n"
-    "╰──────────────────┴───────────────────┴───────────┴──────────┴──────────────────────┴─────────────────╯\n"
+    "╭──────────────────┬─────────────────┬───────────────────┬───────────┬──────────┬──────────────────────╮\n"
+    "│ name             │ description     │ health            │ sync      │ version  │ last sync            │\n"
+    "├──────────────────┼─────────────────┼───────────────────┼───────────┼──────────┼──────────────────────┤\n"
+    "│ bl01t-di-cam-01  │                 │ Progressing       │ OutOfSync │ main     │                      │\n"
+    "│ bl01t-ea-test-01 │ my nice service │ Healthy           │ Synced    │ 2024.7.1 │ 2026-09-22T09:03:19Z │\n"
+    "│ bl01t-mo-sim-01  │                 │ Healthy (Stopped) │ Synced    │ 2024.7.2 │ 2026-09-21T14:12:02Z │\n"
+    "╰──────────────────┴─────────────────┴───────────────────┴───────────┴──────────┴──────────────────────╯\n"
 )
 PS_WIDE_EXPECT = (
-    "╭──────────────────┬───────────────────┬───────────┬──────────┬──────────────────────┬─────────────────┬────────────────────────────╮\n"
-    "│ name             │ health            │ sync      │ version  │ last sync            │ description     │ properties                 │\n"
-    "├──────────────────┼───────────────────┼───────────┼──────────┼──────────────────────┼─────────────────┼────────────────────────────┤\n"
-    "│ bl01t-di-cam-01  │ Progressing       │ OutOfSync │ main     │                      │                 │                            │\n"
-    "│ bl01t-ea-test-01 │ Healthy           │ Synced    │ 2024.7.1 │ 2026-09-22T09:03:19Z │ my nice service │ location=bench team=optics │\n"
-    "│ bl01t-mo-sim-01  │ Healthy (Stopped) │ Synced    │ 2024.7.2 │ 2026-09-21T14:12:02Z │                 │                            │\n"
-    "╰──────────────────┴───────────────────┴───────────┴──────────┴──────────────────────┴─────────────────┴────────────────────────────╯\n"
+    "╭──────────────────┬─────────────────┬───────────────────┬───────────┬──────────┬──────────────────────┬────────────────────────────╮\n"
+    "│ name             │ description     │ health            │ sync      │ version  │ last sync            │ properties                 │\n"
+    "├──────────────────┼─────────────────┼───────────────────┼───────────┼──────────┼──────────────────────┼────────────────────────────┤\n"
+    "│ bl01t-di-cam-01  │                 │ Progressing       │ OutOfSync │ main     │                      │                            │\n"
+    "│ bl01t-ea-test-01 │ my nice service │ Healthy           │ Synced    │ 2024.7.1 │ 2026-09-22T09:03:19Z │ location=bench team=optics │\n"
+    "│ bl01t-mo-sim-01  │                 │ Healthy (Stopped) │ Synced    │ 2024.7.2 │ 2026-09-21T14:12:02Z │                            │\n"
+    "╰──────────────────┴─────────────────┴───────────────────┴───────────┴──────────┴──────────────────────┴────────────────────────────╯\n"
 )

edge_containers_cli-5.4.1/tests/test_demo.py

@@ -0,0 +1,57 @@
+import pytest
+
+from edge_containers_cli.cmds.commands import CommandError
+
+
+def test_logs(mock_run, DEMO):
+    mock_run.run_cli("logs demo-ea-01")
+
+
+def test_log_history(mock_run, DEMO):
+    mock_run.run_cli("log-history demo-ea-01")
+
+
+def test_restart(mock_run, DEMO):
+    mock_run.run_cli("restart demo-ea-01")
+
+
+def test_start(mock_run, DEMO):
+    mock_run.run_cli("start demo-ea-01")
+
+
+def test_stop(mock_run, DEMO):
+    mock_run.run_cli("stop demo-ea-01")
+
+
+def test_set_desc(mock_run, DEMO):
+    # `Commands.set_description` is now abstract - DemoCommands must
+    # implement it (a real decision, e.g. a CommandError like the
+    # plain-k8s backend, or a validate-and-no-op like this) rather than
+    # silently inheriting the base's `raise NotImplementedError`.
+    mock_run.run_cli("set-desc demo-ea-01 new-description")
+
+
+def test_set_desc_unknown_service(mock_run, DEMO):
+    with pytest.raises(CommandError, match="not found"):
+        mock_run.run_cli("set-desc no-such-service new-description")
+
+
+def test_ps(mock_run, DEMO, wide_console):
+    expect = (
+        "╭────────────┬────────────────┬─────────┬────────┬─────────┬──────────────────────╮\n"
+        "│ name       │ description    │ health  │ sync   │ version │ last sync            │\n"
+        "├────────────┼────────────────┼─────────┼────────┼─────────┼──────────────────────┤\n"
+        "│ demo-ea-00 │ demo-device-00 │ Healthy │ Synced │ 1.0.25  │ 2024-10-22T11:23:08Z │\n"
+        "│ demo-ea-01 │ demo-device-01 │ Healthy │ Synced │ 1.0.24  │ 2024-10-22T11:23:03Z │\n"
+        "│ demo-ea-02 │ demo-device-02 │ Healthy │ Synced │ 1.0.23  │ 2024-10-22T11:23:04Z │\n"
+        "│ demo-ea-03 │ demo-device-03 │ Healthy │ Synced │ 1.0.22  │ 2024-10-22T11:23:07Z │\n"
+        "│ demo-ea-04 │ demo-device-04 │ Healthy │ Synced │ 1.0.21  │ 2024-10-22T11:23:01Z │\n"
+        "│ demo-ea-05 │ demo-device-05 │ Healthy │ Synced │ 1.0.20  │ 2024-10-22T11:23:03Z │\n"
+        "│ demo-ea-06 │ demo-device-06 │ Healthy │ Synced │ 1.0.19  │ 2024-10-22T11:23:07Z │\n"
+        "│ demo-ea-07 │ demo-device-07 │ Healthy │ Synced │ 1.0.18  │ 2024-10-22T11:23:01Z │\n"
+        "╰────────────┴────────────────┴─────────┴────────┴─────────┴──────────────────────╯\n"
+    )
+
+    res = mock_run.run_cli("ps")
+
+    assert expect in res

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/tests/test_k8s.py

@@ -84,11 +84,11 @@ def test_stop(mock_run, K8S):
 
 
 K8S_PS_EXPECT = (
-    "╭──────────────────┬─────────┬──────┬───────────────┬──────────────────────┬─────────────╮\n"
-    "│ name             │ health  │ sync │ version       │ last sync            │ description │\n"
-    "├──────────────────┼─────────┼──────┼───────────────┼──────────────────────┼─────────────┤\n"
-    "│ bl01t-ea-test-01 │ Healthy │      │ 2024.7.824f-b │ 2024-07-26T08:16:07Z │             │\n"
-    "╰──────────────────┴─────────┴──────┴───────────────┴──────────────────────┴─────────────╯\n"
+    "╭──────────────────┬─────────────┬─────────┬──────┬───────────────┬──────────────────────╮\n"
+    "│ name             │ description │ health  │ sync │ version       │ last sync            │\n"
+    "├──────────────────┼─────────────┼─────────┼──────┼───────────────┼──────────────────────┤\n"
+    "│ bl01t-ea-test-01 │             │ Healthy │      │ 2024.7.824f-b │ 2024-07-26T08:16:07Z │\n"
+    "╰──────────────────┴─────────────┴─────────┴──────┴───────────────┴──────────────────────╯\n"
 )
 
 

edge_containers_cli-5.4.0/tests/test_demo.py

@@ -1,57 +0,0 @@
-import pytest
-
-from edge_containers_cli.cmds.commands import CommandError
-
-
-def test_logs(mock_run, DEMO):
-    mock_run.run_cli("logs demo-ea-01")
-
-
-def test_log_history(mock_run, DEMO):
-    mock_run.run_cli("log-history demo-ea-01")
-
-
-def test_restart(mock_run, DEMO):
-    mock_run.run_cli("restart demo-ea-01")
-
-
-def test_start(mock_run, DEMO):
-    mock_run.run_cli("start demo-ea-01")
-
-
-def test_stop(mock_run, DEMO):
-    mock_run.run_cli("stop demo-ea-01")
-
-
-def test_set_desc(mock_run, DEMO):
-    # `Commands.set_description` is now abstract - DemoCommands must
-    # implement it (a real decision, e.g. a CommandError like the
-    # plain-k8s backend, or a validate-and-no-op like this) rather than
-    # silently inheriting the base's `raise NotImplementedError`.
-    mock_run.run_cli("set-desc demo-ea-01 new-description")
-
-
-def test_set_desc_unknown_service(mock_run, DEMO):
-    with pytest.raises(CommandError, match="not found"):
-        mock_run.run_cli("set-desc no-such-service new-description")
-
-
-def test_ps(mock_run, DEMO, wide_console):
-    expect = (
-        "╭────────────┬─────────┬────────┬─────────┬──────────────────────┬────────────────╮\n"
-        "│ name       │ health  │ sync   │ version │ last sync            │ description    │\n"
-        "├────────────┼─────────┼────────┼─────────┼──────────────────────┼────────────────┤\n"
-        "│ demo-ea-00 │ Healthy │ Synced │ 1.0.25  │ 2024-10-22T11:23:08Z │ demo-device-00 │\n"
-        "│ demo-ea-01 │ Healthy │ Synced │ 1.0.24  │ 2024-10-22T11:23:03Z │ demo-device-01 │\n"
-        "│ demo-ea-02 │ Healthy │ Synced │ 1.0.23  │ 2024-10-22T11:23:04Z │ demo-device-02 │\n"
-        "│ demo-ea-03 │ Healthy │ Synced │ 1.0.22  │ 2024-10-22T11:23:07Z │ demo-device-03 │\n"
-        "│ demo-ea-04 │ Healthy │ Synced │ 1.0.21  │ 2024-10-22T11:23:01Z │ demo-device-04 │\n"
-        "│ demo-ea-05 │ Healthy │ Synced │ 1.0.20  │ 2024-10-22T11:23:03Z │ demo-device-05 │\n"
-        "│ demo-ea-06 │ Healthy │ Synced │ 1.0.19  │ 2024-10-22T11:23:07Z │ demo-device-06 │\n"
-        "│ demo-ea-07 │ Healthy │ Synced │ 1.0.18  │ 2024-10-22T11:23:01Z │ demo-device-07 │\n"
-        "╰────────────┴─────────┴────────┴─────────┴──────────────────────┴────────────────╯\n"
-    )
-
-    res = mock_run.run_cli("ps")
-
-    assert expect in res

{edge_containers_cli-5.4.0 → edge_containers_cli-5.4.1}/tests/test_monitor.py

@@ -119,11 +119,11 @@ def test_monitor_columns():
     columns = [str(column.key.value) for column in table.ordered_columns]
     assert columns == [
         "name",
+        "description",
         "health",
         "sync",
         "version",
         "last sync",
-        "description",
     ]
 
     assert table.row_count == 8
@@ -143,11 +143,11 @@ def test_monitor_columns_wide():
     columns = [str(column.key.value) for column in table.ordered_columns]
     assert columns == [
         "name",
+        "description",
         "health",
         "sync",
         "version",
         "last sync",
-        "description",
         "properties",
     ]