Merge pull request #1145 from projectsyn/renovate/click-8.x

Update dependency click to v8.2.0

Author: simu

.github/workflows/test.yml

@@ -162,4 +162,9 @@ jobs:
     - name: Build image
       run: make docker
     - name: Run image
-      run: docker run docker.io/projectsyn/commodore:test
+      run: |
+        docker run docker.io/projectsyn/commodore:test || exit_code=$?
+        if [ "$exit_code" -ne 2 ]; then
+          echo "Unexpected exit code $exit_code, expected 2"
+          exit $exit_code
+        fi

poetry.lock

@@ -31,7 +31,7 @@ python = ">=3.10, <3.13"
 boto3 = "^1.26.145"
 botocore="^1.29.145"
 kapitan = "0.34.6"
-click = "8.1.8"
+click = "8.2.0"
 gitpython = "3.1.44"
 requests = "2.32.3"
 url-normalize = "2.2.1"

pyproject.toml

@@ -10,7 +10,8 @@ def test_runas_module():
     Can this package be run as a Python module?
     """
     exit_status = call("python -m commodore", shell=True)
-    assert exit_status == 0
+    # click 8.2 changed exit code for `no_args_is_help` from 0 to 2
+    assert exit_status == 2
 
 
 def test_entrypoint():

tests/test_cli.py

@@ -138,7 +138,7 @@ def test_catalog_compile_cli(
     if exitcode == 1:
         assert (
             "Cannot push changes when local global or tenant repo override is specified"
-            in result.stdout
+            in result.stderr
         )
     if "push" in expected and not expected.get("fetch_dependencies", True):
         assert (

tests/test_cli_catalog.py

@@ -42,7 +42,8 @@ def test_commodore_fetch_token(
     result = cli_runner(["fetch-token"] + args)
 
     assert result.exit_code == exitcode
-    assert result.stdout == output
+    out = result.stdout if result.exit_code == 0 else result.stderr
+    assert out == output
 
 
 @pytest.mark.parametrize(

tests/test_cli_oidc.py

@@ -1107,7 +1107,7 @@ def test_component_update_no_cruft_json(tmp_path: P, cli_runner: RunnerFunc):
     result = cli_runner(["component", "update", str(component_path)])
     assert result.exit_code == 1
     assert (
-        result.stdout
+        result.stderr
         == "Error: Provided component path doesn't have `.cruft.json`, can't update.\n"
     )
 
@@ -1171,7 +1171,7 @@ def test_component_update_test_cases(
     assert result.exit_code == (0 if len(updated_cases) > 0 else 1)
     if len(updated_cases) == 0:
         assert (
-            result.stdout
+            result.stderr
             == "Error: Component template doesn't support removing all test cases.\n"
         )
         final_cases = orig_cases
@@ -1745,9 +1745,9 @@ def test_component_update_raises_on_merge_conflict(
     result = cli_runner(["component", "update", "--lib", str(component_path)])
 
     assert result.exit_code == 1
-    stdout_lines = result.stdout.strip().split("\n")
+    stderr_lines = result.stderr.strip().split("\n")
     assert (
-        stdout_lines[-1]
+        stderr_lines[-1]
         == "Error: Can't commit template changes: merge error in "
         + "'lib/test-component.libsonnet'. Please resolve conflicts and commit manually."
     )