-
Notifications
You must be signed in to change notification settings - Fork 7.1k
[ci] removing requirement file and constraint file build args #60151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
0106c30
ef671ab
f6180f6
d89104f
1476b55
993c46b
5cf73f6
02901a6
ff67522
0c5982c
c810067
13e1c5c
fa25e29
f812a8f
032aae8
94531c7
c490498
40fe920
f31ead3
ab7d51e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,10 +3,10 @@ froms: ["nvidia/cuda:$CUDA_VERSION-devel-ubuntu22.04"] | |
| dockerfile: docker/base-deps/Dockerfile | ||
| srcs: | ||
| - python/requirements_compiled.txt | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| - $REQUIREMENTS_FILE | ||
| - python/requirements_compiled_py$PYTHON_VERSION.txt | ||
| - python/deplocks/base_deps/ray_base_deps_py$PYTHON_VERSION.lock | ||
| build_args: | ||
| - PYTHON_VERSION | ||
| - BASE_IMAGE=nvidia/cuda:$CUDA_VERSION-devel-ubuntu22.04 | ||
| - PYTHON_DEPSET=$REQUIREMENTS_FILE | ||
| tags: | ||
| - cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cu$CUDA_VERSION-base$ARCH_SUFFIX | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,8 @@ ENV TERM=xterm | |
|
|
||
| ARG SSH_PORT=5020 | ||
|
|
||
| ARG PYTHON_DEPSET | ||
| ARG PYTHON_VERSION=3.10 | ||
| ARG PYTHON_DEPSET="python/deplocks/base_extra/ray_base_extra_py${PYTHON_VERSION}.lock" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. when this is copied in, this will overwrite the one that is copied in from
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. correct. Should overwrite the existing base-deps lock file |
||
|
|
||
| COPY "$PYTHON_DEPSET" /home/ray/python_depset.lock | ||
|
|
||
|
|
@@ -92,8 +93,6 @@ if [[ "$ARCH" == "x86_64" ]]; then | |
| rm -rf "${DYNOLOG_TMP}" | ||
| fi | ||
|
|
||
| PYTHON_VERSION="$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" | ||
|
|
||
| uv pip install --system --no-cache-dir --no-deps --index-strategy unsafe-best-match \ | ||
| -r $HOME/python_depset.lock | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,10 @@ froms: ["nvidia/cuda:$CUDA_VERSION-runtime-ubuntu22.04"] | |
| dockerfile: docker/base-slim/Dockerfile | ||
| srcs: | ||
| - python/requirements_compiled.txt | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| - $CONSTRAINTS_FILE | ||
| - $REQUIREMENTS_FILE | ||
| - python/requirements_compiled_py$PYTHON_VERSION.txt | ||
| - python/deplocks/base_slim/ray_base_slim_py$PYTHON_VERSION.lock | ||
| build_args: | ||
| - PYTHON_VERSION | ||
| - BASE_IMAGE=nvidia/cuda:$CUDA_VERSION-runtime-ubuntu22.04 | ||
| - PYTHON_DEPSET=$REQUIREMENTS_FILE | ||
| - CONSTRAINTS_FILE=$CONSTRAINTS_FILE | ||
| tags: | ||
| - cr.ray.io/rayproject/ray-slim-py$PYTHON_VERSION-cu$CUDA_VERSION-base$ARCH_SUFFIX | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
srcsentry forpython/requirements_compiled.txtappears to be unnecessary. The correspondingdocker/base-deps/Dockerfilehas been updated to use the$CONSTRAINTS_FILEbuild argument, which defaults topython/requirements_compiled_py${PYTHON_VERSION}.txt, and no longer directly copiespython/requirements_compiled.txt. To keep the build context clean and avoid confusion, this line can be removed.