Merge pull request #1918 from camptocamp/backport/1915-to-1.3

[Backport 1.3] Print version only of pre-installed application and c2cciutils
camptocamp · Sep 9, 2024 · a877f77 · a877f77
2 parents 892f520 + b8ee775
commit a877f77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/c2cciutils/__init__.py b/c2cciutils/__init__.py
@@ -181,15 +181,13 @@ def get_config(branch: Optional[str] = None) -> c2cciutils.configuration.Configu
             "print_versions": {
                 "versions": [
                     {"name": "c2cciutils", "cmd": ["c2cciutils", "--version"]},
-                    {"name": "codespell", "cmd": ["codespell", "--version"], "prefix": "codespell "},
                     {"name": "java", "cmd": ["java", "-version"]},
                     {"name": "python", "cmd": ["python3", "--version"]},
                     {"name": "pip", "cmd": ["python3", "-m", "pip", "--version"]},
                     {"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"]},
                 ]
             },
             "print_config": True,

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: