From: Nabil Ghodbane Date: Thu, 5 Sep 2024 22:17:02 +0000 (+0200) Subject: bos #42835: support DB10, UB20.04 and CO7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=17ef0941c44d5699f376862e40b26ba5ba2da8ca;p=tools%2Fsat_salome.git bos #42835: support DB10, UB20.04 and CO7 --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index a975578..8a16cdc 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -228,6 +228,7 @@ __overwrite__ : 'APPLICATION.products.netcdf' : '4.6.2' 'APPLICATION.products.qt' : '5.15.2' 'APPLICATION.products.qwt' : '6.1.6' + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_UB20_04' } 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.sip' : '5.5.0' 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } @@ -292,10 +293,13 @@ __overwrite__ : # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.rm_products' : ['nose_py3','assimulo'] # + 'APPLICATION.products.BasicIterativeStatistics' : 'v0.0.7' 'APPLICATION.products.nlopt' : '2.4.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.hdf5' : 'native' + 'APPLICATION.products.poetry_core' : '1.6.1' + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_DB10' } 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.qt' : '5.15.2' 'APPLICATION.products.qwt' : '6.1.6' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 7e26585..ba19783 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -3,7 +3,7 @@ APPLICATION : { - name : 'SALOME-master' + name : 'SALOME-9.13.0' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist tag : 'master' dev : 'no' @@ -37,6 +37,7 @@ APPLICATION : # PREREQUISITES : alabaster : '0.7.6' Babel : '2.14.0' + BasicIterativeStatistics : 'v0.1.0' boost : '1.71.0' CAS : {tag : 'CR780-SALOME-PATCH', section: 'version_CR780_SALOME_PATCH', base: 'no'} catalyst: '2.0' @@ -116,12 +117,16 @@ APPLICATION : petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'} Pillow : '8.4.0' planegcs : '0.18-3cb6890' + poetry : '1.8.3' + poetry_core : '1.9.0' + pyyaml: '6.0' psutil : '5.9.8' PyFMI : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip'} Pygments : '2.17.2' pyparsing : '3.1.1' PyQt : '5.15.3' pyreadline : '2.0' + pytest : '8.1.1' Python : '3.9.14' pytz : '2017.2' qt : '5.15.2' @@ -245,6 +250,8 @@ __overwrite__ : __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] 'APPLICATION.products.openturns' : {tag:'1.22', base:'no', section:'version_1_22_CO7'} + 'APPLICATION.products.pyyaml' : {tag: '6.0', base: 'no', section: 'version_6_0_CO7' } + 'APPLICATION.products.poetry' : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_CO7' } } { __condition__ : "VARS.dist in ['CO8']" diff --git a/products/compil_scripts/BasicIterativeStatistics.sh b/products/compil_scripts/BasicIterativeStatistics.sh index f3a2fe1..a8e53ae 100755 --- a/products/compil_scripts/BasicIterativeStatistics.sh +++ b/products/compil_scripts/BasicIterativeStatistics.sh @@ -17,7 +17,7 @@ cp -R $SOURCE_DIR/* . echo echo "*** ${PYTHONBIN} -m pip install . --prefix=${PRODUCT_INSTALL}" -${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation -vvv +${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip . --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation if [ $? -ne 0 ] ; then echo "Error on pip install" exit 1 diff --git a/products/compil_scripts/poetry-1.5.1.sh b/products/compil_scripts/poetry-1.5.1.sh new file mode 100755 index 0000000..2028cd5 --- /dev/null +++ b/products/compil_scripts/poetry-1.5.1.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +echo "##########################################################################" +echo "poetry " $VERSION +echo "##########################################################################" + +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +echo "*** check installation" +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH +export PATH=${PRODUCT_INSTALL}/bin:$PATH +mkdir -p ${PRODUCT_INSTALL} +rm -rf $BUILD_DIR +mkdir -p $BUILD_DIR/cache/pip +cd $BUILD_DIR + +USE_WHEELS=true +case $LINUX_DISTRIBUTION in + DB10|UB20*) + export WHEELS=('poetry-1.5.1-py3-none-any.whl') + ;; + *) + exit 1 + ;; +esac +if $USE_WHEELS == true ; then + for WHEEL in "${WHEELS[@]}"; do + echo $WHELL + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages + if [ $? -ne 0 ]; then + echo "ERROR: could not install $WHEEL" + exit 1 + fi + done +else + echo "Not implemented" +fi +if [ -d ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin ];then + mv ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin* ${PRODUCT_INSTALL}/bin +fi + +echo +echo "########## END" diff --git a/products/compil_scripts/poetry-1.8.3.sh b/products/compil_scripts/poetry-1.8.3.sh new file mode 100755 index 0000000..6bab7ef --- /dev/null +++ b/products/compil_scripts/poetry-1.8.3.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +echo "##########################################################################" +echo "poetry " $VERSION +echo "##########################################################################" + +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +echo "*** check installation" +export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH +export PATH=${PRODUCT_INSTALL}/bin:$PATH +mkdir -p ${PRODUCT_INSTALL} +rm -rf $BUILD_DIR +mkdir -p $BUILD_DIR/cache/pip +cd $BUILD_DIR + +USE_WHEELS=true +case $LINUX_DISTRIBUTION in + DB10|UB20*|CO7) + export WHEELS=('poetry-1.8.3-py3-none-any.whl') + ;; + *) + exit 1 + ;; +esac +if $USE_WHEELS == true ; then + for WHEEL in "${WHEELS[@]}"; do + echo $WHELL + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages + if [ $? -ne 0 ]; then + echo "ERROR: could not install $WHEEL" + exit 1 + fi + done +else + echo "Not implemented" +fi +if [ -d ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin ];then + mv ${PRODUCT_INSTALL}/lib/python3.7/site-packages/bin* ${PRODUCT_INSTALL}/bin +fi + +echo +echo "########## END" diff --git a/products/compil_scripts/poetry.sh b/products/compil_scripts/poetry.sh index b967f6e..78b1539 100755 --- a/products/compil_scripts/poetry.sh +++ b/products/compil_scripts/poetry.sh @@ -32,29 +32,3 @@ fi echo echo "########## END" - -# USE_WHEELS=true -# case $LINUX_DISTRIBUTION in -# DB11) -# export WHEELS=('poetry-1.8.3-py3-none-any.whl' -# ) -# ;; -# *) -# exit 1 -# ;; -# esac -# if $USE_WHEELS == true ; then -# for WHEEL in "${WHEELS[@]}"; do -# echo $WHELL -# ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/$WHEEL --no-deps --target=$PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages -# if [ $? -ne 0 ]; then -# echo "ERROR: could not install $WHEEL" -# exit 1 -# fi -# done -# else -# echo "Not implemented" -# fi - -# echo -# echo "########## END" diff --git a/products/compil_scripts/pyyaml-6.0.sh b/products/compil_scripts/pyyaml-6.0.sh index c98217a..ff792e0 100755 --- a/products/compil_scripts/pyyaml-6.0.sh +++ b/products/compil_scripts/pyyaml-6.0.sh @@ -15,7 +15,7 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$ export PATH=${PRODUCT_INSTALL}/bin:$PATH USE_WHEELS=true case $LINUX_DISTRIBUTION in - DB11) + DB11|CO7) export WHEELS=('PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl') ;; *) diff --git a/products/poetry.pyconf b/products/poetry.pyconf index a00ddb0..8592e52 100644 --- a/products/poetry.pyconf +++ b/products/poetry.pyconf @@ -1,4 +1,4 @@ -zdefault : +default : { name : "poetry" build_source : "script" @@ -27,3 +27,21 @@ zdefault : pip : "no" } } + +version_1_5_1_DB10: +{ + compil_script: "poetry-1.5.1.sh" + archive_info : {archive_name : "poetry-1.5.1-x86_64.tar.gz"} +} + +version_1_5_1_UB20_04: +{ + compil_script: "poetry-1.5.1.sh" + archive_info : {archive_name : "poetry-1.5.1-x86_64.tar.gz"} +} + +version_1_8_3_CO7: +{ + compil_script: "poetry-1.8.3.sh" + archive_info : {archive_name : "poetry-1.8.3-x86_64.tar.gz"} +} diff --git a/products/pyyaml.pyconf b/products/pyyaml.pyconf index 87d4a6b..1582205 100644 --- a/products/pyyaml.pyconf +++ b/products/pyyaml.pyconf @@ -33,3 +33,9 @@ version_6_0_DB11: compil_script: "pyyaml-6.0.sh" archive_info : {archive_name : "pyyaml-6.0-x86_64.tar.gz"} } + +version_6_0_CO7: +{ + compil_script: "pyyaml-6.0.sh" + archive_info : {archive_name : "pyyaml-6.0-x86_64.tar.gz"} +}