Merge pull request #2720 from syedriko/syedriko-lcore-3121

LCORE-3121: [Cleanup] scripts/konflux_requirements.sh vs scripts konflux_resolve.py

Author: tisnik

Makefile

@@ -362,8 +362,8 @@ distribution-archives:	## Generate distribution archives to be uploaded into Pyt
 upload-distribution-archives:	## Upload distribution archives into Python registry
 	uv run python -m twine upload --repository ${PYTHON_REGISTRY} dist/*
 
-konflux-requirements:	## Generate hermetic requirements.*.txt file for Konflux build
-	./scripts/konflux_requirements.sh
+konflux-requirements:	## Generate .konflux/requirements.*.txt files for Konflux hermetic build
+	scripts/konflux_resolve.py --profile cpu
 
 konflux-rpm-lock:	## Generate rpm.lock.yaml file for Konflux build
 	./scripts/generate-rpm-lock.sh

README.md

@@ -1515,7 +1515,7 @@ Update these files when you:
 make konflux-requirements
 ```
 
-This compiles Python dependencies from `pyproject.toml` using `uv`, splits packages by their source index (PyPI vs Red Hat's internal registry), and generates hermetic requirements files with pinned versions and hashes for Konflux builds.
+This compiles Python dependencies from `pyproject.toml` using a fork of `uv` that supports a "prefer-index" package version resolution policy, splits packages by their source index (PyPI vs Red Hat's internal registry), and generates hermetic requirements files with pinned versions and hashes for Konflux builds.
 
 **Files produced:**
 - `.konflux/requirements.hashes.source.txt` – PyPI packages with hashes

scripts/konflux_requirements.sh

@@ -985,13 +985,8 @@ def load_wheel_only(path: str) -> set[str]:
 
 _UV_COMPILED_RE = re.compile(r"^([a-zA-Z0-9][a-zA-Z0-9._-]*)([=<>!~].*)?$")
 
-
-UV_BINARY = os.environ.get(
-    "UV_BINARY",
-    os.path.join(
-        os.path.dirname(__file__), "..", "..", "uv", "target", "release", "uv"
-    ),
-)
+UV_IMAGE = os.environ.get("UV_IMAGE", "quay.io/syedriko/uv:prefer-index")
+CONTAINER_RUNTIME = os.environ.get("CONTAINER_RUNTIME", "podman")
 
 
 def uv_resolve(
@@ -1012,9 +1007,15 @@ def uv_resolve(
             else "requirements.overrides.txt"
         ),
     )
-    uv = UV_BINARY if os.path.isfile(UV_BINARY) else "uv"
     cmd = [
-        uv,
+        CONTAINER_RUNTIME,
+        "run",
+        "--rm",
+        "--volume",
+        f"{os.getcwd()}:/io:ro",
+        "--workdir",
+        "/io",
+        UV_IMAGE,
         "pip",
         "compile",
         "pyproject.toml",
@@ -1027,6 +1028,8 @@ def uv_resolve(
         rhoai_index_url,
         "--default-index",
         "https://pypi.org/simple/",
+        "--index-strategy",
+        "prefer-index",
         "--emit-index-annotation",
         "--no-sources",
         "--group",