From: Nabil Ghodbane Date: Mon, 28 Oct 2024 11:10:32 +0000 (+0100) Subject: remove tabulations X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b17bb3587084c157587d93c08e792bf4102dfe8f;p=tools%2Fsat_salome.git remove tabulations --- diff --git a/products/compil_scripts/openturns-1.23.sh b/products/compil_scripts/openturns-1.23.sh index f193f87..2976a2d 100755 --- a/products/compil_scripts/openturns-1.23.sh +++ b/products/compil_scripts/openturns-1.23.sh @@ -163,12 +163,7 @@ if [ -d ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/dist-packages ]; then mv ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/dist-packages ${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages fi -#export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH} -#export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH} -#chmod +x ${SOURCE_DIR}/openturns-1.23/python/test/t_features.py -#${PYTHONBIN} ${SOURCE_DIR}/openturns-1.23/python/test/t_features.py -if [ $? -ne 0 ] -then +if [ $? -ne 0 ]; then echo "ERROR testing Openturns features...." exit 4 fi @@ -368,14 +363,13 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then continue fi echo "INFO: install joblib-1.1.0" - if ! ${PYTHONBIN} -c "import joblib"; then - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/joblib-1.1.0/joblib-1.1.0-py2.py3-none-any.whl --no-deps - if [ $? -ne 0 ] - then - echo "FATAL: could not install joblib-1.1.0" - exit 6 - fi - fi + if ! ${PYTHONBIN} -c "import joblib"; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/joblib-1.1.0/joblib-1.1.0-py2.py3-none-any.whl --no-deps + if [ $? -ne 0 ]; then + echo "FATAL: could not install joblib-1.1.0" + exit 6 + fi + fi if ! ${PYTHONBIN} -c "import sklearn"; then if [ "${LINUX_DISTRIBUTION}" != "DB10" ]; then echo "INFO: install scikit-learn-1.2.2" @@ -503,13 +497,13 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then fi fi elif [ $k == "otwrapy" ]; then - echo "INFO: install tqdm-4.66.5" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/tqdm-4.66.5/tqdm-4.66.5-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL - if [ $? -ne 0 ] - then - echo "FATAL: could not install tqdm 4.66.5" - exit 6 - fi + echo "INFO: install tqdm-4.66.5" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/tqdm-4.66.5/tqdm-4.66.5-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL + if [ $? -ne 0 ] + then + echo "FATAL: could not install tqdm 4.66.5" + exit 6 + fi fi fi