From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 14 May 2024 11:22:14 +0000 (+0200)
Subject: spns #41854: FD34
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=65e6f1b4c47319be8b741e5c471a181b5651cc56;p=tools%2Fsat_salome.git

spns #41854: FD34
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index d9991ae..2c2320e 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -352,10 +352,15 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD34']"
-        'APPLICATION.products.opencv'    : '3.2.0'
-        'APPLICATION.products.qwt'       : '6.1.6'
-        'APPLICATION.products.omniORB'   : '4.2.5'
-        'APPLICATION.products.omniORBpy' : '4.2.5'
+        'APPLICATION.products.opencv'           : '3.2.0'
+        'APPLICATION.products.qwt'              : '6.1.6'
+        'APPLICATION.products.omniORB'          : '4.2.5'
+        'APPLICATION.products.omniORBpy'        : '4.2.5'
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2',  base: 'no', section: 'version_0_1_2_no_pip' }
+        'APPLICATION.products.markdown_it_py'   : {tag: '3.0.0',  base: 'no', section: 'version_3_0_0_no_pip' }
+        'APPLICATION.products.rich'             : {tag: '13.7.1', base: 'no', section: 'version_13_7_1_no_pip'}
+        'APPLICATION.products.meshio'           : {tag: '5.3.5' , base: 'no', section: 'version_5_3_5_no_pip' }
+        'APPLICATION.products.h5py'             : {tag: '3.11.0', base: 'no', section: 'version_3_11_0_no_pip'}
         '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
diff --git a/products/compil_scripts/h5py-3.11.0.sh b/products/compil_scripts/h5py-3.11.0.sh
index 99146c8..d2ad2db 100755
--- a/products/compil_scripts/h5py-3.11.0.sh
+++ b/products/compil_scripts/h5py-3.11.0.sh
@@ -30,6 +30,16 @@ case $LINUX_DISTRIBUTION in
             mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
         fi
         ;;
+    FD34)
+        WHEELS=('h5py-3.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl')
+        for WHEEL in "${WHEELS[@]}"; do
+            ${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 "Not implemented"
         exit 1
diff --git a/products/compil_scripts/meshio-5.3.5.sh b/products/compil_scripts/meshio-5.3.5.sh
index 2ab68f7..c4549ed 100755
--- a/products/compil_scripts/meshio-5.3.5.sh
+++ b/products/compil_scripts/meshio-5.3.5.sh
@@ -16,7 +16,7 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$
 export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
 case $LINUX_DISTRIBUTION in
-    CO9|FD32|UB20*)
+    CO9|FD32|FD34|UB20*)
         WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
                 'meshio-5.3.5-py3-none-any.whl'
                )