Skip to content

Commit d087394

Browse files
committed
RHAIENG-304: remove dependency overrides as pylock.toml can't work in that place (#2145)
``` error: The file `./pylock.toml` appears to be a `pylock.toml` file, but overrides must be specified in `requirements.txt` format ```
1 parent a612098 commit d087394

File tree

20 files changed

+20
-20
lines changed

20 files changed

+20
-20
lines changed

codeserver/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ COPY ${CODESERVER_SOURCE_CODE}/pylock.toml ./
147147
RUN echo "Installing softwares and packages" && \
148148
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
149149
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
150-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
150+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
151151
# Fix permissions to support pip in Openshift environments \
152152
chmod -R g+w /opt/app-root/lib/python3.12/site-packages && \
153153
fix-permissions /opt/app-root -P

jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ COPY ${DATASCIENCE_SOURCE_CODE}/setup-elyra.sh ${DATASCIENCE_SOURCE_CODE}/utils
116116
RUN echo "Installing softwares and packages" && \
117117
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
118118
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
119-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
119+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
120120
# setup path for runtime configuration
121121
mkdir /opt/app-root/runtimes && \
122122
mkdir /opt/app-root/pipeline-runtimes && \

jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh
6767
RUN echo "Installing softwares and packages" && \
6868
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
6969
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
70-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
70+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
7171
# Disable announcement plugin of jupyterlab \
7272
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
7373
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh
166166
RUN echo "Installing softwares and packages" && \
167167
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
168168
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
169-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
169+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
170170
# Disable announcement plugin of jupyterlab \
171171
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
172172
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh
101101
RUN echo "Installing softwares and packages" && \
102102
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
103103
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
104-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
104+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
105105
# Disable announcement plugin of jupyterlab \
106106
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
107107
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \

jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ COPY ${PYTORCH_SOURCE_CODE}/pylock.toml ./
228228
RUN echo "Installing softwares and packages" && \
229229
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
230230
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
231-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
231+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
232232
# setup path for runtime configuration
233233
mkdir /opt/app-root/runtimes && \
234234
# Remove default Elyra runtime-images \

jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ COPY ${PYTORCH_SOURCE_CODE}/pylock.toml ./
228228
RUN echo "Installing softwares and packages" && \
229229
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
230230
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
231-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
231+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
232232
# setup path for runtime configuration
233233
mkdir /opt/app-root/runtimes && \
234234
# Remove default Elyra runtime-images \

jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.rocm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ COPY ${PYTORCH_SOURCE_CODE}/pylock.toml ${PYTORCH_SOURCE_CODE}/de-vendor-torch.s
163163
RUN echo "Installing softwares and packages" && \
164164
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
165165
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
166-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
166+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
167167
# setup path for runtime configuration
168168
mkdir /opt/app-root/runtimes && \
169169
# Remove default Elyra runtime-images \

jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ COPY ${TENSORFLOW_SOURCE_CODE}/pylock.toml ./
233233
RUN echo "Installing softwares and packages" && \
234234
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
235235
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
236-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
236+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
237237
# setup path for runtime configuration
238238
mkdir /opt/app-root/runtimes && \
239239
# Remove default Elyra runtime-images \

jupyter/trustyai/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ COPY ${TRUSTYAI_SOURCE_CODE}/pylock.toml ./
136136
RUN echo "Installing softwares and packages" && \
137137
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
138138
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
139-
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml --build-constraints=./pylock.toml && \
139+
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
140140
# setup path for runtime configuration
141141
mkdir /opt/app-root/runtimes && \
142142
# Remove default Elyra runtime-images \

0 commit comments

Comments
 (0)