From: Nabil Ghodbane Date: Mon, 9 Sep 2024 13:04:43 +0000 (+0200) Subject: BOS #42835: Implement BasicIterativeStatistics support in SAT (II) X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eccda981e705abf3aa366d84433f3d1232599dfb;p=tools%2Fsat_salome.git BOS #42835: Implement BasicIterativeStatistics support in SAT (II) --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 4ecee1c..aa547ce 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -112,7 +112,7 @@ APPLICATION : Pillow : 'native' planegcs : '0.18-3cb6890' psutil : 'native' - poetry : '1.8.3' + poetry : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_x86_64' } poetry_core : '1.9.0' pyyaml: 'native' PyFMI : '2.6' @@ -354,7 +354,7 @@ __overwrite__ : # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it. __condition__ : "VARS.dist in ['CO8']" - 'APPLICATION.rm_products' : ['nose_py3','assimulo'] # + 'APPLICATION.rm_products' : ['nose_py3','assimulo', 'poetry', 'poetry_core', 'BasicIterativeStatistics'] # 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } 'APPLICATION.products.cminpack' : '1.3.6' 'APPLICATION.products.nlopt' : '2.4.2' @@ -368,6 +368,7 @@ __overwrite__ : 'APPLICATION.products.rich' : {tag: '12.6.0', base: 'no', section: 'version_12_6_0_no_pip'} 'APPLICATION.products.meshio' : {tag: '4.3.13', base: 'no', section: 'version_4_3_13_no_pip' } 'APPLICATION.products.h5py' : {tag: '3.0.0', base: 'no', section: 'version_3_0_0_no_pip' } + 'APPLICATION.products.poetry_core' : {tag: '1.9.0', base: 'no', section: 'version_1_9_0_x86_64' } } { __condition__ : "VARS.dist in ['CO9']" @@ -395,6 +396,7 @@ __overwrite__ : 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} 'APPLICATION.products.YDEFX' : {tag: 'master', base: 'no', section: 'version_master_CO9' } 'APPLICATION.products.YACS' : {tag: 'master', base: 'no', section: 'version_master_CO9' } + 'APPLICATION.products.poetry_core' : {tag: '1.9.0', base: 'no', section: 'version_1_9_0_x86_64' } } { __condition__ : "VARS.dist in ['FD32']" @@ -432,6 +434,7 @@ __overwrite__ : 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' } } { __condition__ : "VARS.dist in ['FD36']" diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index c608332..2a2e979 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -117,9 +117,9 @@ 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 : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_x86_64' } poetry_core : '1.9.0' - pyyaml: '6.0' + pyyaml : {tag: '6.0', base: 'no', section: 'version_6_0_x86_64' } psutil : '5.9.8' PyFMI : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip'} Pygments : '2.17.2' @@ -250,8 +250,6 @@ __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_x86_64' } - 'APPLICATION.products.poetry' : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_x86_64' } } { __condition__ : "VARS.dist in ['CO8']" diff --git a/products/compil_scripts/poetry-1.8.3.sh b/products/compil_scripts/poetry-1.8.3.sh index 6bab7ef..d30b239 100755 --- a/products/compil_scripts/poetry-1.8.3.sh +++ b/products/compil_scripts/poetry-1.8.3.sh @@ -13,29 +13,17 @@ 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 +export WHEELS=('poetry-1.8.3-py3-none-any.whl') +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 +if [ -d ${PRODUCT_INSTALL}/lib/python$PYTHON_VERSION/site-packages/bin ];then + mv ${PRODUCT_INSTALL}/lib/python$PYTHON_VERSION/site-packages/bin* ${PRODUCT_INSTALL}/bin fi echo diff --git a/products/compil_scripts/pyyaml-6.0.sh b/products/compil_scripts/pyyaml-6.0.sh index ff792e0..079f575 100755 --- a/products/compil_scripts/pyyaml-6.0.sh +++ b/products/compil_scripts/pyyaml-6.0.sh @@ -13,27 +13,15 @@ cd $BUILD_DIR export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH export PATH=${PRODUCT_INSTALL}/bin:$PATH -USE_WHEELS=true -case $LINUX_DISTRIBUTION in - 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') - ;; - *) - 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 +export WHEELS=('PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl') +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 echo echo "########## END" diff --git a/products/compil_scripts/pyyaml.sh b/products/compil_scripts/pyyaml.sh index 225cac3..8afb645 100755 --- a/products/compil_scripts/pyyaml.sh +++ b/products/compil_scripts/pyyaml.sh @@ -4,6 +4,7 @@ echo "########################################################################## echo "pyyaml " $VERSION echo "##########################################################################" +mkdir -p ${PRODUCT_INSTALL} rm -rf $BUILD_DIR mkdir -p $BUILD_DIR cd $BUILD_DIR