BOS #42835: Implement BasicIterativeStatistics support in SAT (II)

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 4ecee1c4958488ae9eca9e5c98f82b443edaf9ee..aa547cee3bf4bbc7390a708e2d3538bc72f77dd9 100644 (file)
--- 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 c608332752f52811fe54d2eabdc5f6a3c4fca04e..2a2e9795d5260e0f80dbbc61418cea3ee2787bbe 100644 (file)
--- 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 6bab7efd7cb3b4671f04c6ef2afb02ee1921b70f..d30b239c86b279e762ad280ab66ad75a9aac7c19 100755 (executable)
--- 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 ff792e03ca5602fd59194f09ab5a10b4b3323797..079f575e7471fe129b82466b7716461f7a9252c3 100755 (executable)
--- 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 225cac398b4d11d610e9f7c9eb1518c775d3d47e..8afb645a84160db291ab176cc9d26b741bff1ced 100755 (executable)
--- 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