Merge pull request #1920 from camptocamp/backport/1915-to-1.5

[Backport 1.5] Print version only of pre-installed application and c2cciutils
camptocamp · Sep 9, 2024 · f004180 · f004180
2 parents 3e5b7ba + 2496828
commit f004180
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/c2cciutils/schema.json b/c2cciutils/schema.json
@@ -699,8 +699,7 @@
             { "name": "node", "prefix": "node ", "cmd": ["node", "--version"] },
             { "name": "npm", "prefix": "npm ", "cmd": ["npm", "--version"] },
             { "name": "docker", "cmd": ["docker", "--version"] },
-            { "name": "docker-compose", "cmd": ["docker-compose", "--version"] },
-            { "name": "kubectl", "cmd": ["kubectl", "version"] },
+            { "name": "docker compose", "cmd": ["docker", "compose", "version"] },
             { "name": "make", "cmd": ["make", "--version"], "prefix": "make " },
             { "name": "pip_packages", "cmd": ["pip", "freeze", "--all"], "prefix": "pip packages:\n" },
             {

diff --git a/c2cciutils/scripts/main.py b/c2cciutils/scripts/main.py
@@ -27,7 +27,7 @@ def main() -> None:
         print(yaml.dump(c2cciutils.get_config(), default_flow_style=False, Dumper=yaml.SafeDumper))
 
     if args.version:
-        for pkg in ("c2cciutils", "black", "isort"):
+        for pkg in ("c2cciutils", "black", "isort", "codespell"):
             try:
                 print(f"{pkg} {pkg_resources.get_distribution(pkg).version}")
             except pkg_resources.DistributionNotFound: