Skip to content

Commit eff0195

Browse files
dibryantjiridanek
andauthored
Remove requirments-elyra.txt from the code base (#761)
* Remove requirments-elyra.txt from the code base * changes that were requested in review * also remove volumeMounts from pod.yaml files * fix linter errors ./runtimes/rocm-tensorflow/ubi9-python-3.11/kustomize/base/kustomization.yaml Error: 11:1 [empty-lines] too many blank lines (1 > 0) ./runtimes/tensorflow/ubi9-python-3.11/kustomize/base/kustomization.yaml Error: 11:1 [empty-lines] too many blank lines (1 > 0) and wrongly intended line in Makefile, that's not linted automatically * fix missing comment starter # marks in `utils/requirements-elyra.txt` without it, pip would error out on this invalid requirements file --------- Co-authored-by: Jiri Daněk <[email protected]>
1 parent 7650cd8 commit eff0195

File tree

25 files changed

+40
-608
lines changed

25 files changed

+40
-608
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ validate-runtime-image: bin/kubectl
538538
$(info # Running tests for $(NOTEBOOK_NAME) runtime...)
539539
$(KUBECTL_BIN) wait --for=condition=ready pod runtime-pod --timeout=300s
540540
@required_commands=$(REQUIRED_RUNTIME_IMAGE_COMMANDS) ; \
541+
fail=0 ; \
541542
if [[ $$image == "" ]] ; then \
542543
echo "Usage: make validate-runtime-image image=<container-image-name>" ; \
543544
exit 1 ; \
@@ -552,11 +553,12 @@ validate-runtime-image: bin/kubectl
552553
fi; \
553554
if [ $$cmd == "python3" ]; then \
554555
echo "=> Checking notebook execution..." ; \
555-
$(KUBECTL_BIN) exec runtime-pod -- /bin/sh -c "python3 -m pip install -r /opt/app-root/elyra/requirements-elyra.txt && \
556+
$(KUBECTL_BIN) exec runtime-pod -- /bin/sh -c "curl https://raw.githubusercontent.com/opendatahub-io/elyra/refs/heads/main/etc/generic/requirements-elyra.txt --output req.txt && \
557+
python3 -m pip install -r req.txt > /dev/null && \
556558
curl https://raw.githubusercontent.com/nteract/papermill/main/papermill/tests/notebooks/simple_execute.ipynb --output simple_execute.ipynb && \
557559
python3 -m papermill simple_execute.ipynb output.ipynb > /dev/null" ; \
558560
if [ $$? -ne 0 ]; then \
559-
echo "ERROR: Image does not meet Python requirements criteria in requirements-elyra.txt" ; \
561+
echo "ERROR: Image does not meet Python requirements criteria in pipfile" ; \
560562
fail=1; \
561563
fi; \
562564
fi; \

runtimes/datascience/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ images:
88
- name: runtime-workbench
99
newName: quay.io/opendatahub/workbench-images
1010
newTag: runtime-datascience-ubi9-python-3.11
11-
configMapGenerator:
12-
- name: req-config
13-
files:
14-
- requirements-elyra.txt

runtimes/datascience/ubi9-python-3.11/kustomize/base/pod.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@ spec:
2020
requests:
2121
cpu: 500m
2222
memory: 500Mi
23-
volumeMounts:
24-
- name: config
25-
mountPath: /opt/app-root/elyra
26-
volumes:
27-
- name: config
28-
configMap:
29-
name: req-config

runtimes/datascience/ubi9-python-3.11/kustomize/base/requirements-elyra.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,7 @@
1-
# Copied from: https://github.com/elyra-ai/elyra/blob/main/etc/generic/requirements-elyra.txt
2-
1+
# Originally copied from: https://github.com/elyra-ai/elyra/blob/main/etc/generic/requirements-elyra.txt
32
# This is a comprehensive list of python dependencies that Elyra requires to execute Jupyter notebooks.
4-
ipykernel==6.29.5
5-
ipython==8.27.0
6-
ipython-genutils==0.2.0
7-
jinja2==3.1.4
8-
jupyter-client==8.6.3
9-
jupyter-core==5.7.2
10-
MarkupSafe==2.1.5
11-
minio==7.2.8
12-
nbclient==0.10.0
13-
nbconvert==7.16.4
14-
nbformat==5.10.4
15-
papermill==2.6.0
16-
pyzmq==26.2.0
17-
prompt-toolkit==3.0.47
18-
requests==2.32.3
19-
tornado==6.4.1
20-
traitlets==5.14.3
21-
urllib3==2.2.3
22-
#
23-
# These excluded are transitive dependencies of the included python packages.
24-
#ansiwrap==0.8.4
25-
#appnope==0.1.3
26-
#asttokens==2.0.5
27-
#attrs==21.4.0
28-
#backcall==0.2.0
29-
#beautifulsoup4==4.11.1
30-
#bleach==5.0.0
31-
#certifi==2021.10.8
32-
#charset-normalizer==2.0.12
33-
#click==8.1.3
34-
#debugpy==1.6.0
35-
#decorator==5.1.1
36-
#defusedxml==0.7.1
37-
#entrypoints==0.4
38-
#executing==0.8.3
39-
#fastjsonschema==2.15.3
40-
#idna==3.3
41-
#importlib-resources==5.7.1
42-
#jedi==0.18.1
43-
#jsonschema==4.5.1
44-
#jupyterlab-pygments==0.2.2
45-
#matplotlib-inline==0.1.3
46-
#mistune==0.8.4
47-
#nest-asyncio==1.5.5
48-
#packaging==21.3
49-
#pandocfilters==1.5.0
50-
#parso==0.8.3
51-
#pexpect==4.8.0
52-
#pickleshare==0.7.5
53-
#psutil==5.9.0
54-
#ptyprocess==0.7.0
55-
#pure-eval==0.2.2
56-
#Pygments==2.12.0
57-
#pyparsing==3.0.9
58-
#pyrsistent==0.18.1
59-
#python-dateutil==2.8.2
60-
#PyYAML==6.0
61-
#six==1.16.0
62-
#soupsieve==2.3.2.post1
63-
#stack-data==0.2.0
64-
#tenacity==8.0.1
65-
#textwrap3==0.9.2
66-
#tinycss2==1.1.1
67-
#tqdm==4.64.0
68-
#wcwidth==0.2.5
69-
#webencodings==0.5.1
70-
#zipp==3.8.0
71-
#
3+
4+
# This (now effectively blank) requirements.txt file is left here for the exclusive reason to escape falling into
5+
# https://github.com/opendatahub-io/elyra/blob/0ec8a571df6b3614aca91f20fe0b1dbdc8743dc6/elyra/pipeline/kfp/processor_kfp.py#L1099,
6+
# in case the details are need please follow the comprehensive list of python dependencies present here:
7+
# https://raw.githubusercontent.com/opendatahub-io/elyra/refs/heads/main/etc/generic/requirements-elyra.txt

runtimes/minimal/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ images:
88
- name: runtime-workbench
99
newName: quay.io/opendatahub/workbench-images
1010
newTag: runtime-minimal-ubi9-python-3.11
11-
configMapGenerator:
12-
- name: req-config
13-
files:
14-
- requirements-elyra.txt

runtimes/minimal/ubi9-python-3.11/kustomize/base/pod.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@ spec:
2020
requests:
2121
cpu: 500m
2222
memory: 500Mi
23-
volumeMounts:
24-
- name: config
25-
mountPath: /opt/app-root/elyra
26-
volumes:
27-
- name: config
28-
configMap:
29-
name: req-config

runtimes/minimal/ubi9-python-3.11/kustomize/base/requirements-elyra.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 6 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,7 @@
1-
# Copied from: https://github.com/elyra-ai/elyra/blob/main/etc/generic/requirements-elyra.txt
2-
1+
# Originally copied from: https://github.com/elyra-ai/elyra/blob/main/etc/generic/requirements-elyra.txt
32
# This is a comprehensive list of python dependencies that Elyra requires to execute Jupyter notebooks.
4-
ipykernel==6.29.5
5-
ipython==8.27.0
6-
ipython-genutils==0.2.0
7-
jinja2==3.1.4
8-
jupyter-client==8.6.3
9-
jupyter-core==5.7.2
10-
MarkupSafe==2.1.5
11-
minio==7.2.8
12-
nbclient==0.10.0
13-
nbconvert==7.16.4
14-
nbformat==5.10.4
15-
papermill==2.6.0
16-
pyzmq==26.2.0
17-
prompt-toolkit==3.0.47
18-
requests==2.32.3
19-
tornado==6.4.1
20-
traitlets==5.14.3
21-
urllib3==2.2.3
22-
#
23-
# These excluded are transitive dependencies of the included python packages.
24-
#ansiwrap==0.8.4
25-
#appnope==0.1.3
26-
#asttokens==2.0.5
27-
#attrs==21.4.0
28-
#backcall==0.2.0
29-
#beautifulsoup4==4.11.1
30-
#bleach==5.0.0
31-
#certifi==2021.10.8
32-
#charset-normalizer==2.0.12
33-
#click==8.1.3
34-
#debugpy==1.6.0
35-
#decorator==5.1.1
36-
#defusedxml==0.7.1
37-
#entrypoints==0.4
38-
#executing==0.8.3
39-
#fastjsonschema==2.15.3
40-
#idna==3.3
41-
#importlib-resources==5.7.1
42-
#jedi==0.18.1
43-
#jsonschema==4.5.1
44-
#jupyterlab-pygments==0.2.2
45-
#matplotlib-inline==0.1.3
46-
#mistune==0.8.4
47-
#nest-asyncio==1.5.5
48-
#packaging==21.3
49-
#pandocfilters==1.5.0
50-
#parso==0.8.3
51-
#pexpect==4.8.0
52-
#pickleshare==0.7.5
53-
#psutil==5.9.0
54-
#ptyprocess==0.7.0
55-
#pure-eval==0.2.2
56-
#Pygments==2.12.0
57-
#pyparsing==3.0.9
58-
#pyrsistent==0.18.1
59-
#python-dateutil==2.8.2
60-
#PyYAML==6.0
61-
#six==1.16.0
62-
#soupsieve==2.3.2.post1
63-
#stack-data==0.2.0
64-
#tenacity==8.0.1
65-
#textwrap3==0.9.2
66-
#tinycss2==1.1.1
67-
#tqdm==4.64.0
68-
#wcwidth==0.2.5
69-
#webencodings==0.5.1
70-
#zipp==3.8.0
71-
#
3+
4+
# This (now effectively blank) requirements.txt file is left here for the exclusive reason to escape falling into
5+
# https://github.com/opendatahub-io/elyra/blob/0ec8a571df6b3614aca91f20fe0b1dbdc8743dc6/elyra/pipeline/kfp/processor_kfp.py#L1099,
6+
# in case the details are need please follow the comprehensive list of python dependencies present here:
7+
# https://raw.githubusercontent.com/opendatahub-io/elyra/refs/heads/main/etc/generic/requirements-elyra.txt

runtimes/pytorch/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ images:
88
- name: runtime-workbench
99
newName: quay.io/opendatahub/workbench-images
1010
newTag: runtime-pytorch-ubi9-python-3.11
11-
configMapGenerator:
12-
- name: req-config
13-
files:
14-
- requirements-elyra.txt

0 commit comments

Comments
 (0)