spns #41854: DB11

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index b06b2758f1ec01da0108e6fd2e88e7c71e997553..21ab43c50bb044fe67753302072e9ee714c90db9 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -270,8 +270,13 @@ __overwrite__ :
         'APPLICATION.products.opencv'           : '3.2.0'
         'APPLICATION.products.hdf5'             : 'native'
         'APPLICATION.products.cminpack'         : 'native'
+        '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.PyFMI'            : {tag:'2.6',    base: 'no', section: 'version_2_6_no_pip'}
+        'APPLICATION.products.rich'             : 'native'
+        'APPLICATION.products.meshio'           : {tag:'5.3.5', base:  'no', section: 'version_5_3_5_no_pip'}
         'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'        }
     }
     {
         __condition__ : "VARS.dist in ['DB12']"

diff --git a/products/compil_scripts/meshio-5.3.5.sh b/products/compil_scripts/meshio-5.3.5.sh
index a4c766cd55c3f8d2d8fbce52687504fd1618fc1a..2ab68f7cbba9243d7fead4403ca3fefb604c842b 100755 (executable)
--- a/products/compil_scripts/meshio-5.3.5.sh
+++ b/products/compil_scripts/meshio-5.3.5.sh
@@ -28,6 +28,18 @@ case $LINUX_DISTRIBUTION in
             fi
         done
         ;;
+    DB11)
+        WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
+                'meshio-5.3.5-py3-none-any.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/env_scripts/meshio.py b/products/env_scripts/meshio.py
index cca451c649557258381d1ea1cee009be54ac1206..885c6a97eec14671041d951e5d84e9a40e18ee59 100644 (file)
--- a/products/env_scripts/meshio.py
+++ b/products/env_scripts/meshio.py
@@ -8,13 +8,17 @@ def set_env(env, prereq_dir, version):
     pyver = 'python' + env.get('PYTHON_VERSION')
     env.set('MESHIO_ROOT_DIR',prereq_dir)
     env.set('HDF5_DISABLE_VERSION_CHECK', '1')
+    env.set("MESHIO_VERSION",version)
     if not platform.system() == "Windows" :
         env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
         env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
+        env.prepend('PATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages', 'bin'))
     else:
         # meshio is installed in Python lib directory
         # no need to expand PATH
         pass
 
 def set_nativ_env(env):
-    pass
+    import meshio
+    meshio_version=meshio.__version__
+    env.set("MESHIO_VERSION",meshio_version)