Skip to content

Commit 8e863cc

Browse files
ptitzlerptitzler
authored
Remove references to Python 3.7 (elyra-ai#3101)
Signed-off-by: Patrick Titzler <ptitzler@us.ibm.com>
1 parent 321516a commit 8e863cc

14 files changed

Lines changed: 14 additions & 126 deletions

File tree

‎Makefile‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,9 @@ release: yarn-install build-ui build-server ## Build wheel file for release
212212
elyra-image-env: ## Creates a conda env consisting of the dependencies used in images
213213
conda env remove -y -n $(ELYRA_IMAGE_ENV)
214214
conda create -y -n $(ELYRA_IMAGE_ENV) python=$(PYTHON_VERSION) --channel conda-forge
215-
if [ "$(PYTHON_VERSION)" == "3.7" ]; then \
216-
$(CONDA_ACTIVATE) $(ELYRA_IMAGE_ENV) && \
217-
$(PYTHON_PIP) install -r etc/generic/requirements-elyra-py37.txt && \
218-
conda deactivate; \
219-
else \
220-
$(CONDA_ACTIVATE) $(ELYRA_IMAGE_ENV) && \
221-
$(PYTHON_PIP) install -r etc/generic/requirements-elyra.txt && \
222-
conda deactivate; \
223-
fi
215+
$(CONDA_ACTIVATE) $(ELYRA_IMAGE_ENV) && \
216+
$(PYTHON_PIP) install -r etc/generic/requirements-elyra.txt && \
217+
conda deactivate;
224218

225219
## Test targets
226220

@@ -361,14 +355,7 @@ validate-runtime-image: # Validate that runtime image meets minimum criteria
361355
IMAGE_PYTHON3_MINOR_VERSION=`docker run --rm $$image $$cmd --version | cut -d' ' -f2 | cut -d'.' -f2` ; \
362356
if [[ $$IMAGE_PYTHON3_MINOR_VERSION -lt 8 ]]; then \
363357
echo "WARNING: Container image $$image requires Python 3.8 or greater for latest generic component dependency installation" ; \
364-
echo "=> Checking notebook execution..." ; \
365-
docker run -v $$(pwd)/etc/generic:/opt/elyra/ --rm $$image /bin/bash -c "python3 -m pip install -r /opt/elyra/requirements-elyra-py37.txt && \
366-
curl https://raw.githubusercontent.com/nteract/papermill/main/papermill/tests/notebooks/simple_execute.ipynb --output simple_execute.ipynb && \
367-
python3 -m papermill simple_execute.ipynb output.ipynb > /dev/null" ; \
368-
if [ $$? -ne 0 ]; then \
369-
echo "ERROR: Container image $$image does not meet Python requirements criteria in requirements-elyra-py37.txt" ; \
370-
fail=1; \
371-
fi; \
358+
fail=1; \
372359
elif [[ $$IMAGE_PYTHON3_MINOR_VERSION -ge 8 ]]; then \
373360
echo "=> Checking notebook execution..." ; \
374361
docker run -v $$(pwd)/etc/generic:/opt/elyra/ --rm $$image /bin/bash -c "python3 -m pip install -r /opt/elyra/requirements-elyra.txt && \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For detailed information refer to the [installation documentation](https://elyra
9595

9696
### Prerequisites :
9797
* [Node.js 16+](https://nodejs.org/en/)
98-
* [Python 3.7+](https://www.python.org/downloads/)
98+
* [Python 3.8+](https://www.python.org/downloads/)
9999
* [Miniconda](https://docs.conda.io/en/latest/miniconda.html) (optional)
100100

101101
### Install current release (for JupyterLab 3.x)

‎create-release.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,6 @@ def update_version_to_release() -> None:
246246
r"elyra-ai/elyra/main/elyra/airflow/bootstrapper.py",
247247
rf"elyra-ai/elyra/v{new_version}/elyra/airflow/bootstrapper.py",
248248
)
249-
sed(
250-
_source("docs/source/recipes/running-elyra-in-air-gapped-environment.md"),
251-
r"elyra-ai/elyra/main/etc/generic/requirements-elyra-py37.txt",
252-
rf"elyra-ai/elyra/v{new_version}/etc/generic/requirements-elyra-py37.txt",
253-
)
254249
sed(
255250
_source("docs/source/recipes/running-elyra-in-air-gapped-environment.md"),
256251
r"elyra-ai/elyra/main/etc/generic/requirements-elyra.txt",
@@ -368,11 +363,6 @@ def update_version_to_dev() -> None:
368363
rf"elyra-ai/elyra/v{new_version}/elyra/airflow/bootstrapper.py",
369364
r"elyra-ai/elyra/main/elyra/airflow/bootstrapper.py",
370365
)
371-
sed(
372-
_source("docs/source/recipes/running-elyra-in-air-gapped-environment.md"),
373-
rf"elyra-ai/elyra/v{new_version}/etc/generic/requirements-elyra-py37.txt",
374-
r"elyra-ai/elyra/main/etc/generic/requirements-elyra-py37.txt",
375-
)
376366
sed(
377367
_source("docs/source/recipes/running-elyra-in-air-gapped-environment.md"),
378368
rf"elyra-ai/elyra/v{new_version}/etc/generic/requirements-elyra.txt",

‎docs/source/getting_started/installation.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The Elyra [JupyterLab extensions](https://jupyterlab.readthedocs.io/en/stable/us
2222
### Prerequisites
2323

2424
* [Node.js 16+](https://nodejs.org/en/)
25-
* [Python 3.7](https://www.python.org/downloads/) (or later)
25+
* [Python 3.8+](https://www.python.org/downloads/) (or later)
2626

2727
JupyterLab dependencies:
2828
- Elyra >= 2.0.0 requires JupyterLab 3.x

‎docs/source/recipes/running-elyra-in-air-gapped-environment.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,14 @@ During pipeline execution in the Kubeflow Pipelines or Apache Airflow environmen
5353
https://raw.githubusercontent.com/elyra-ai/elyra/main/etc/kfp/pip.conf
5454
https://raw.githubusercontent.com/elyra-ai/elyra/main/elyra/kfp/bootstrapper.py
5555
https://raw.githubusercontent.com/elyra-ai/elyra/main/elyra/airflow/bootstrapper.py
56-
https://raw.githubusercontent.com/elyra-ai/elyra/main/etc/generic/requirements-elyra-py37.txt
5756
https://raw.githubusercontent.com/elyra-ai/elyra/main/etc/generic/requirements-elyra.txt
5857
```
5958
In air-gapped environments you must store a copy of these files in a location that is accessible via an anonymous HTTP `GET` request and configure the following environment variables _in the environment where JupyterLab is running_:
6059
- For Kubeflow Pipelines:
6160
- `ELYRA_PIP_CONFIG_URL` (URL of `.../etc/kfp/pip.conf`)
6261
- `ELYRA_BOOTSTRAP_SCRIPT_URL` (URL of `.../elyra/kfp/bootstrapper.py`)
63-
- `ELYRA_REQUIREMENTS_URL_PY37` (URL of `.../etc/generic/requirements-elyra-py37.txt`)
6462
- `ELYRA_REQUIREMENTS_URL` (URL of `.../etc/generic/requirements-elyra.txt`)
6563
- For Apache Airflow:
6664
- `ELYRA_BOOTSTRAP_SCRIPT_URL` (URL of `.../elyra/airflow/bootstrapper.py`)
67-
- `ELYRA_REQUIREMENTS_URL_PY37` (URL of `.../etc/generic/requirements-elyra-py37.txt`)
6865
- `ELYRA_REQUIREMENTS_URL` (URL of `.../etc/generic/requirements-elyra.txt`)
6966
- **S3-compatible cloud storage for [generic components](../user_guide/pipeline-components.html#generic-components)**: When processing pipeline nodes that are implemented using [generic components](../user_guide/pipeline-components.html#generic-components), Elyra downloads the pipeline artifacts that were uploaded when the pipeline was exported or submitted.

‎elyra/airflow/bootstrapper.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,7 @@ def package_install(cls) -> None:
376376
@classmethod
377377
def determine_elyra_requirements(cls) -> Any:
378378
if sys.version_info.major == 3:
379-
if sys.version_info.minor == 7:
380-
return "requirements-elyra-py37.txt"
381-
elif sys.version_info.minor in [8, 9, 10, 11]:
379+
if sys.version_info.minor in [8, 9, 10, 11]:
382380
return "requirements-elyra.txt"
383381
logger.error(
384382
f"This version of Python '{sys.version_info.major}.{sys.version_info.minor}' "

‎elyra/airflow/operator.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
f"elyra/{ELYRA_GITHUB_BRANCH}/etc/generic/requirements-elyra.txt",
4343
)
4444

45-
ELYRA_REQUIREMENTS_URL_PY37 = os.getenv(
46-
"ELYRA_REQUIREMENTS_URL_PY37",
47-
f"https://raw.githubusercontent.com/{ELYRA_GITHUB_ORG}/"
48-
f"elyra/{ELYRA_GITHUB_BRANCH}/etc/generic/requirements-elyra-py37.txt",
49-
)
50-
5145

5246
class BootscriptBuilder(object):
5347
def __init__(
@@ -98,8 +92,6 @@ def container_cmd(self):
9892
f"echo 'Downloading {ELYRA_BOOTSCRIPT_URL}' && "
9993
f"curl {common_curl_options} -L {ELYRA_BOOTSCRIPT_URL} --output bootstrapper.py && "
10094
f"echo 'Downloading {ELYRA_REQUIREMENTS_URL}' && "
101-
f"echo 'Downloading {ELYRA_REQUIREMENTS_URL_PY37}' && "
102-
f"curl {common_curl_options} -L {ELYRA_REQUIREMENTS_URL_PY37} --output requirements-elyra-py37.txt && "
10395
f"curl {common_curl_options} -L {ELYRA_REQUIREMENTS_URL} "
10496
f"--output requirements-elyra.txt && "
10597
"python3 -m pip install packaging && "

‎elyra/kfp/bootstrapper.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,7 @@ def package_install(cls, user_volume_path) -> None:
589589
@classmethod
590590
def determine_elyra_requirements(cls) -> Any:
591591
if sys.version_info.major == 3:
592-
if sys.version_info.minor == 7:
593-
return "requirements-elyra-py37.txt"
594-
elif sys.version_info.minor in [8, 9, 10, 11]:
592+
if sys.version_info.minor in [8, 9, 10, 11]:
595593
return "requirements-elyra.txt"
596594
logger.error(
597595
f"This version of Python '{sys.version_info.major}.{sys.version_info.minor}' "

‎elyra/pipeline/kfp/processor_kfp.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,11 +1083,6 @@ def _compose_container_command_args(
10831083
f"https://raw.githubusercontent.com/{elyra_github_org}/"
10841084
f"elyra/{elyra_github_branch}/etc/generic/requirements-elyra.txt",
10851085
)
1086-
elyra_requirements_url_py37 = os.getenv(
1087-
"elyra_requirements_url_py37",
1088-
f"https://raw.githubusercontent.com/{elyra_github_org}/"
1089-
f"elyra/{elyra_github_branch}/etc/generic/requirements-elyra-py37.txt",
1090-
)
10911086

10921087
if is_crio_runtime:
10931088
container_work_dir = CRIO_VOL_WORKDIR_PATH
@@ -1109,8 +1104,6 @@ def _compose_container_command_args(
11091104
f"curl {common_curl_options} -L {elyra_bootstrap_script_url} --output bootstrapper.py",
11101105
f"echo 'Downloading {elyra_requirements_url}' && "
11111106
f"curl {common_curl_options} -L {elyra_requirements_url} --output requirements-elyra.txt",
1112-
f"echo 'Downloading {elyra_requirements_url_py37}' && "
1113-
f"curl {common_curl_options} -L {elyra_requirements_url_py37} --output requirements-elyra-py37.txt",
11141107
]
11151108

11161109
if is_crio_runtime:

‎elyra/tests/pipeline/resources/validation_pipelines/kf_invalid_node_property_in_component.pipeline‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"app_data": {
1616
"label": "Run notebook using papermill",
1717
"component_parameters": {
18-
"runtime_image": "python:3.7",
18+
"runtime_image": "python:3.8",
1919
"component_source": "/Users/akchin/opt/anaconda3/envs/test-package/lib/python3.8/site-packages/elyra/pipeline/resources/kfp/run_notebook_using_papermill/component.yaml",
2020
"component_source_type": "filename",
2121
"notebook": {

0 commit comments

Comments
 (0)