From: Guytri KASTANE Date: Mon, 29 Apr 2024 07:26:39 +0000 (+0200) Subject: spns #41606: add sections for py3.6 and py3.9 in openturns 1.22 compil script for... X-Git-Tag: V9_13_0rc2~53 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fgk782450%2Fopenturns_1_22_for_embedded;p=tools%2Fsat_salome.git spns #41606: add sections for py3.6 and py3.9 in openturns 1.22 compil script for embedded salome --- diff --git a/products/compil_scripts/openturns-1.22.sh b/products/compil_scripts/openturns-1.22.sh index ced175d..98ccb54 100755 --- a/products/compil_scripts/openturns-1.22.sh +++ b/products/compil_scripts/openturns-1.22.sh @@ -437,12 +437,22 @@ if [[ -d "$SOURCE_DIR/otfftw-0.14" ]]; then echo "FATAL: could not install decorator-5.1.0" exit 6 fi - echo "INFO: install scikit-learn-0.24.2" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps - if [ $? -ne 0 ] - then - echo "FATAL: could not install scikit-0.24.2" - exit 6 + if [ "${PYTHON_VERSION}" == "3.6" ]; then + echo "INFO: install scikit-learn-0.24.2" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-0.24.2" + exit 6 + fi + elif [ "${PYTHON_VERSION}" == "3.9" ]; then + echo "INFO: install scikit-learn-1.2.2" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit-learn-1.2.2.tar.gz --no-deps + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-1.2.2" + exit 6 + fi fi fi fi @@ -544,6 +554,8 @@ if [[ -d "$SOURCE_DIR/otfftw-0.14" ]]; then fi elif [ -f ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/setuptools/site-patch.py ]; then cp ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/setuptools/site-patch.py ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages/site.py + elif [ -f ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site.py ]; then + cp ${PYTHON_ROOT_DIR}/lib/python${PYTHON_VERSION}/site.py ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages/site.py else echo "ERROR: could not find site-patch.py" exit 7