Skip to content

Commit f998dff

Browse files
ruivieiraruivieira
committed
Merge remote-tracking branch 'upstream/main' into RHOAIENG-12195-trustyai
# Conflicts: # jupyter/trustyai/ubi9-python-3.11/Pipfile # jupyter/trustyai/ubi9-python-3.11/Pipfile.lock
2 parents b111ff9 + 4317cc1 commit f998dff

File tree

31 files changed

+10717
-14548
lines changed

31 files changed

+10717
-14548
lines changed

‎base/ubi9-python-3.11/Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ verify_ssl = true
77

88
[packages]
99
# Base packages
10-
wheel = "~=0.43.0"
11-
setuptools = "~=69.2.0"
10+
wheel = "~=0.44.0"
11+
setuptools = "~=74.1.2"
1212

1313
[requires]
1414
python_version = "3.11"

‎base/ubi9-python-3.11/Pipfile.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎intel/runtimes/ml/ubi9-python-3.11/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plotly = "~=5.16.1"
1919
scipy = "~=1.11.2"
2020
scikit-learn = "~=1.3.1"
2121
skl2onnx = "~=1.15.0"
22-
codeflare-sdk = "~=0.16.3"
22+
codeflare-sdk = "~=0.19.1"
2323
# DB connectors
2424
pymongo = "~=4.5.0"
2525
psycopg = "~=3.1.10"

‎intel/runtimes/ml/ubi9-python-3.11/Pipfile.lock

Lines changed: 590 additions & 575 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jupyter/datascience/ubi9-python-3.11/Dockerfile

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ WORKDIR /opt/app-root/bin
1515

1616
# Install Python packages and Jupyterlab extensions from Pipfile.lock
1717
COPY Pipfile.lock ./
18+
19+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
1820
# Copy Elyra setup to utils so that it's sourced at startup
19-
COPY setup-elyra.sh ./utils/
21+
# COPY setup-elyra.sh ./utils/
2022

2123
RUN echo "Installing softwares and packages" && \
2224
micropipenv install && \
@@ -51,33 +53,35 @@ ENV PATH="$PATH:/opt/mssql-tools18/bin"
5153
# Other apps and tools installed as default user
5254
USER 1001
5355

56+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
5457
# setup path for runtime configuration
55-
RUN mkdir /opt/app-root/runtimes && \
56-
# switch to Data Science Pipeline \
57-
cp utils/pipeline-flow.svg /opt/app-root/lib/python3.11/site-packages/elyra/static/icons/kubeflow.svg && \
58-
sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.11/site-packages/elyra/pipeline/runtime_type.py && \
59-
sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
60-
sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
61-
# switch to Data Science Pipeline in component catalog \
62-
DIR_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
63-
FILE_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \
64-
URL_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/url-catalog.json" && \
65-
tmp=$(mktemp) && \
66-
jq '.properties.metadata.properties.runtime_type = input' $DIR_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $DIR_COMPONENT && \
67-
jq '.properties.metadata.properties.runtime_type = input' $FILE_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $FILE_COMPONENT && \
68-
jq '.properties.metadata.properties.runtime_type = input' $URL_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $URL_COMPONENT && \
69-
sed -i "s/metadata.metadata.runtime_type/\"DATA_SCIENCE_PIPELINES\"/g" /opt/app-root/share/jupyter/labextensions/@elyra/pipeline-editor-extension/static/lib_index_js.*.js && \
70-
# Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
71-
sed -i 's/widget\.id === \x27jp-MainLogo\x27/widget\.id === \x27jp-MainLogo\x27 \&\& false/' /opt/app-root/share/jupyter/labextensions/@elyra/theme-extension/static/lib_index_js.*.js && \
72-
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
73-
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
74-
# Remove default Elyra runtime-images \
75-
rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
76-
# Fix permissions to support pip in Openshift environments \
58+
# RUN mkdir /opt/app-root/runtimes && \
59+
# # switch to Data Science Pipeline \
60+
# cp utils/pipeline-flow.svg /opt/app-root/lib/python3.11/site-packages/elyra/static/icons/kubeflow.svg && \
61+
# sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.11/site-packages/elyra/pipeline/runtime_type.py && \
62+
# sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
63+
# sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
64+
# # switch to Data Science Pipeline in component catalog \
65+
# DIR_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
66+
# FILE_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \
67+
# URL_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/url-catalog.json" && \
68+
# tmp=$(mktemp) && \
69+
# jq '.properties.metadata.properties.runtime_type = input' $DIR_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $DIR_COMPONENT && \
70+
# jq '.properties.metadata.properties.runtime_type = input' $FILE_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $FILE_COMPONENT && \
71+
# jq '.properties.metadata.properties.runtime_type = input' $URL_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $URL_COMPONENT && \
72+
# sed -i "s/metadata.metadata.runtime_type/\"DATA_SCIENCE_PIPELINES\"/g" /opt/app-root/share/jupyter/labextensions/@elyra/pipeline-editor-extension/static/lib_index_js.*.js && \
73+
# # Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
74+
# sed -i 's/widget\.id === \x27jp-MainLogo\x27/widget\.id === \x27jp-MainLogo\x27 \&\& false/' /opt/app-root/share/jupyter/labextensions/@elyra/theme-extension/static/lib_index_js.*.js && \
75+
# # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
76+
RUN sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
77+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
78+
# # Remove default Elyra runtime-images \
79+
# rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
80+
# # Fix permissions to support pip in Openshift environments \
7781
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
7882
fix-permissions /opt/app-root -P
7983

80-
# Copy Elyra runtime-images definitions and set the version
81-
COPY runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
84+
# # Copy Elyra runtime-images definitions and set the version
85+
# COPY runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
8286

8387
WORKDIR /opt/app-root/src

‎jupyter/datascience/ubi9-python-3.11/Pipfile

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,43 @@ name = "pypi"
77

88
[packages]
99
# Datascience and useful extensions
10-
boto3 = "~=1.34.50"
10+
boto3 = "~=1.35.14"
1111
kafka-python = "~=2.0.2"
12-
matplotlib = "~=3.8.3"
13-
numpy = "~=1.26.4"
14-
pandas = "~=2.2.0"
15-
plotly = "~=5.20.0"
16-
scikit-learn = "~=1.4.0"
17-
scipy = "~=1.12.0"
18-
skl2onnx = "~=1.16.0"
19-
onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
12+
matplotlib = "~=3.9.2"
13+
numpy = "~=2.1.0"
14+
pandas = "~=2.2.2"
15+
plotly = "~=5.23.0"
16+
scikit-learn = "~=1.5.1"
17+
scipy = "~=1.14.1"
18+
skl2onnx = "~=1.17.0"
19+
onnxconverter-common = "~=1.14.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
2020
codeflare-sdk = "~=0.18.0"
21-
memray = "~=1.10.0" # any version above this would cause issue with rich package
21+
2222
# DB connectors
23-
pymongo = "~=4.6.2"
24-
psycopg = "~=3.1.18"
23+
pymongo = "~=4.8.0"
24+
psycopg = "~=3.2.1"
2525
pyodbc = "~=5.1.0"
26-
mysql-connector-python = "~=8.3.0"
26+
mysql-connector-python = "~=9.0.0"
27+
2728
# JupyterLab packages
28-
odh-elyra = "~=3.16.7"
29-
jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
30-
jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
31-
jupyter-server = "~=2.13.0"
32-
jupyter-server-proxy = "~=4.0.0" # Upgrade would bring in jupyterlab 4
29+
30+
#odh-elyra = ">=3.16.7" # For the phase 1, exclude elyra installation. Till this Jira ticket is resolved. https://issues.redhat.com/browse/RHOAIENG-10143
31+
32+
jupyterlab = "~=4.2.4"
33+
jupyter-bokeh = "~=4.0.5"
34+
jupyter-server = "~=2.14.2"
35+
jupyter-server-proxy = "~=4.3.0"
3336
jupyter-server-terminals = "~=0.5.3"
34-
jupyterlab-git = "~=0.44.0"
35-
jupyterlab-lsp = "~=4.2.0"
36-
jupyterlab-widgets = "~=3.0.10"
37-
jupyter-resource-usage = "~=0.7.2"
38-
nbdime = "~=3.2.1"
39-
nbgitpuller = "~=1.2.0"
40-
# pycodestyle is dependency of below packages
41-
# and to achieve compatible of pycodestyle with python-lsp-server[all]
42-
# pinned the below packages
43-
autopep8 = "~=2.0.4"
44-
flake8 = "~=7.0.0"
37+
jupyterlab-git = "~=0.50.1"
38+
jupyterlab-lsp = "~=5.1.0"
39+
jupyterlab-widgets = "~=3.0.13"
40+
jupyter-resource-usage = "~=1.1.0"
41+
nbdime = "~=4.0.1"
42+
nbgitpuller = "~=1.2.1"
43+
4544
# Base packages
46-
wheel = "~=0.43.0"
47-
setuptools = "~=69.2.0"
45+
wheel = "~=0.44.0"
46+
setuptools = "~=74.1.2"
4847

4948
[requires]
5049
python_version = "3.11"

0 commit comments

Comments
 (0)