Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/lockfile-generators/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ The script performs these steps:
| Option | Description |
| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `--pyproject-toml FILE` | Path to `pyproject.toml` (required). Output files are written to the same directory. |
| `--flavor NAME` | Lock file flavor (default: `cpu`). Must match a `Dockerfile.<flavor>` and `build-args/<flavor>.conf` in the project directory. Determines output filenames (`pylock.<flavor>.toml` and `requirements.<flavor>.txt`). |
| `--flavor NAME` | Lock file flavor (default: `cpu`). Must match `Dockerfile.konflux.<flavor>` and `build-args/konflux.<flavor>.conf` in the project directory. Determines output filenames (`pylock.<flavor>.toml` and `requirements.<flavor>.txt`). |
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
| `--download` | After generating the lock, download all wheels into `cachi2/output/deps/pip/` (for local testing with podman; not needed in Konflux CI). |


Expand Down Expand Up @@ -878,9 +878,9 @@ This command:
./scripts/lockfile-generators/create-requirements-lockfile.sh \
--pyproject-toml codeserver/ubi9-python-3.12/pyproject.toml

# Custom flavor (e.g. cuda — requires Dockerfile.konflux.cuda and build-args/cuda.conf)
# Custom flavor (e.g. cuda — requires Dockerfile.konflux.cuda and build-args/konflux.cuda.conf)
./scripts/lockfile-generators/create-requirements-lockfile.sh \
--pyproject-toml codeserver/ubi9-python-3.12/pyproject.toml \
--pyproject-toml jupyter/minimal/ubi9-python-3.12/pyproject.toml \
--flavor cuda
```

Expand Down
10 changes: 6 additions & 4 deletions scripts/lockfile-generators/create-requirements-lockfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ set -euo pipefail
# ./scripts/lockfile-generators/create-requirements-lockfile.sh \
# --pyproject-toml codeserver/ubi9-python-3.12/pyproject.toml --download
#
# # Custom flavor
# # Custom flavor (requires Dockerfile.konflux.<flavor> and build-args/konflux.<flavor>.conf)
# ./scripts/lockfile-generators/create-requirements-lockfile.sh \
# --pyproject-toml codeserver/ubi9-python-3.12/pyproject.toml --flavor cuda
# --pyproject-toml jupyter/minimal/ubi9-python-3.12/pyproject.toml --flavor cuda

SCRIPTS_PATH="scripts/lockfile-generators"
PYLOCKS_GENERATOR="scripts/pylocks_generator.py"
Expand All @@ -48,8 +48,8 @@ Options:
--pyproject-toml FILE Path to pyproject.toml (required)
(e.g. codeserver/ubi9-python-3.12/pyproject.toml)
--flavor NAME Lock file flavor (default: cpu).
Must match a Dockerfile.<flavor> and
build-args/konflux.<flavor>.conf for the RH-index flow.
Must match Dockerfile.konflux.<flavor> and
build-args/konflux.<flavor>.conf (rh-index flow).
--download After generating, download all wheels into
cachi2/output/deps/pip/ for offline builds.
-h, --help Show this help message and exit
Expand Down Expand Up @@ -111,6 +111,8 @@ fi

PYLOCK_FILE="${PROJECT_DIR}/uv.lock.d/pylock.${FLAVOR}.toml"
REQUIREMENTS_INDEX_URL=""
KONFLUX_DOCKERFILE="${PROJECT_DIR}/Dockerfile.konflux.${FLAVOR}"
[[ -f "$KONFLUX_DOCKERFILE" ]] || error_exit "Konflux Dockerfile not found: $KONFLUX_DOCKERFILE"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
if [[ "$PYLOCKS_MODE" == "public-index" ]]; then
PYLOCK_FILE="${PROJECT_DIR}/pylock.toml"
HERMETO_INDEX_URL="https://pypi.org/simple"
Expand Down
Loading