RHAIENG-304, RHAIENG-787: ci(gha): relock from the ground up and force --upgrades, uv by default prefers to change as little as possible to satisfy current pyproject.toml

Author: jiridanek

.github/workflows/piplock-renewal.yaml

@@ -23,6 +23,14 @@ on:  # yamllint disable-line rule:truthy
           - '["3.11"]'
           - '["3.9"]'
           - '["3.8"]'
+      lockfiles_upgrade:
+        description: 'Force full relock and upgrades for pylock.toml (manual runs)'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
       update_optional_dirs:
         description: 'Include optional directories in update'
         required: false
@@ -48,6 +56,8 @@ jobs:
     env:
       BRANCH: ${{ github.event.inputs.branch || 'main' }}
       INCLUDE_OPT_DIRS: ${{ github.event.inputs.update_optional_dirs || 'false' }}
+      # Force full relock on scheduled runs. For manual runs, use the input toggle.
+      FORCE_LOCKFILES_UPGRADE: ${{ github.event_name == 'schedule' && '1' || (github.event.inputs.lockfiles_upgrade == 'true' && '1' || '0') }}
 
     steps:
       - name: Checkout code
@@ -75,6 +85,8 @@ jobs:
       - name: Run make refresh-pipfilelock-files
         run: |
           make refresh-pipfilelock-files PYTHON_VERSION=${{ matrix.python-version }} INCLUDE_OPT_DIRS=${{ env.INCLUDE_OPT_DIRS }}
+        env:
+          FORCE_LOCKFILES_UPGRADE: ${{ env.FORCE_LOCKFILES_UPGRADE }}
 
       - name: Commit changes (if any)
         run: |

scripts/sync-python-lockfiles.sh

@@ -4,6 +4,25 @@ set -Eeuxo pipefail
 # Red Hat's build tooling depends on requirements.txt files with hashes
 # Namely, Konflux (https://konflux-ci.dev/), and Cachi2 (https://github.com/containerbuildsystem/cachi2).
 
+# Optional behavior:
+# - If FORCE_LOCKFILES_UPGRADE=1 (env) or --upgrade (arg) is provided, perform a
+#   ground-up relock and force upgrades using `uv pip compile --upgrade`.
+#   This is intended for scheduled runs, while manual runs should default to off.
+
+ADDITIONAL_UV_FLAGS=""
+for arg in "$@"; do
+  case "$arg" in
+    --upgrade)
+      FORCE_LOCKFILES_UPGRADE=1
+      ;;
+  esac
+done
+
+if [[ "${FORCE_LOCKFILES_UPGRADE:-0}" == "1" ]]; then
+  ADDITIONAL_UV_FLAGS="--upgrade"
+fi
+export ADDITIONAL_UV_FLAGS
+
 # The following will create a pylock.toml file for every pyproject.toml we have.
 uv --version || pip install "uv==0.8.12"
 find . -name pylock.toml -execdir bash -c '
@@ -17,4 +36,5 @@ find . -name pylock.toml -execdir bash -c '
    --python-version="${PWD##*-}" \
    --python-platform linux \
    --no-annotate \
+   ${ADDITIONAL_UV_FLAGS:-} \
    --quiet' \;

tests/test_main.py

@@ -14,6 +14,7 @@
 
 if TYPE_CHECKING:
     from typing import Any
+
     import pytest_subtests
 
 MAKE = shutil.which("gmake") or shutil.which("make")