From 2d203334ac861bc42de4de23f3941448cd228100 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Thu, 11 Jan 2024 00:47:01 +0000 Subject: [PATCH] installer.functions: Drop pip version check and use default --- mk/spksrc.service.installer.functions | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/mk/spksrc.service.installer.functions b/mk/spksrc.service.installer.functions index 1c01163d3fc..a6ee4894091 100644 --- a/mk/spksrc.service.installer.functions +++ b/mk/spksrc.service.installer.functions @@ -68,25 +68,15 @@ initialize_variables () install_python_virtualenv () { - # Output Python version (confirming PATH) + # Print out default python version found in PATH python3 --version - # Create a Python virtualenv - python3 -m venv --system-site-packages ${SYNOPKG_PKGDEST}/env - - # Update pip to match default used by python package - # If none found, update pip to latest version online + # Print out default pip version read -r -a PIP_VERSION 2>/dev/null <<< $(python3 -m pip --version) - if [ "${PIP_VERSION[1]}" ]; then - PIP="pip==${PIP_VERSION[1]}" - echo "INFO: Default pip version found ${PIP}" - else - PIP="pip" - echo "WARNING: No pip found, using default online version" - fi + echo "INFO: Default pip version found ${PIP_VERSION[1]}" - python3 -m pip install --upgrade ${PIP} \ - || echo "ERROR: Python upgrade failed" 1>&2 + # Create a Python virtualenv + python3 -m venv --system-site-packages ${SYNOPKG_PKGDEST}/env if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then set_unix_permissions ${SYNOPKG_PKGDEST}/env