Add meshio dependencies for embedded salome

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 6a41cac71a267edc8270323082255981e0fb09e1..a495844171526cca054a2bcac065e3d7208f3894 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -221,22 +221,29 @@ __overwrite__ :
         'APPLICATION.products.netcdf'           : '4.6.2'
         'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'      }
         'APPLICATION.products.scipy'            : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip'    } # scipy >= 1.4 - system one too old
-        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2'        }
-        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'      }
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2_no_pip'    }
+        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'         }
     }
     {
         #
         __condition__ : "VARS.dist in ['UB22.04']"
-        'APPLICATION.rm_products' : ['TTK'] # causes crashes
-        'APPLICATION.products.cmake'       : 'native' # TTK requires cmake > 3.21
-        'APPLICATION.products.opencv'      : '3.2.0'
-        'APPLICATION.products.cminpack'    : 'native'
-        'APPLICATION.products.netcdf'      : '4.6.2'
-        'APPLICATION.products.omniORB'     : '4.2.5'
-        'APPLICATION.products.omniORBpy'   : '4.2.5'
-        'APPLICATION.products.PyFMI'       : {tag: '2.6',       base: 'no', section: 'version_2_6_UB22_04'                    }
-        'APPLICATION.products.root'        : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_UB22_04'                }
-        'APPLICATION.products.medfile'     : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'                  }
+        'APPLICATION.rm_products'               : ['TTK'] # causes crashes
+        'APPLICATION.products.cmake'            : 'native' # TTK requires cmake > 3.21
+        'APPLICATION.products.cftime'           : 'native'
+        'APPLICATION.products.h5py'             : 'native'
+        'APPLICATION.products.markdown_it_py'   : 'native'
+        'APPLICATION.products.mdurl'            : 'native'
+        'APPLICATION.products.meshio'           : 'native'
+        'APPLICATION.products.netCDF4'          : 'native'
+        'APPLICATION.products.rich'             : 'native'
+        'APPLICATION.products.cminpack'         : 'native'
+        'APPLICATION.products.opencv'           : '3.2.0'
+        'APPLICATION.products.netcdf'           : '4.6.2'
+        'APPLICATION.products.omniORB'          : '4.2.5'
+        'APPLICATION.products.omniORBpy'        : '4.2.5'
+        'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_UB22_04'                    }
+        'APPLICATION.products.root'             : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_UB22_04'                }
+        'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_UB22_04'                  }
     }
     {
         # DB10:
@@ -267,8 +274,14 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['DB12']"
-        'APPLICATION.products.CONFIGURATION'    : 'master'
         'APPLICATION.products.cmake'            : 'native' # TTK requires cmake > 3.21
+        'APPLICATION.products.cftime'           : 'native'
+        'APPLICATION.products.h5py'             : 'native'
+        'APPLICATION.products.markdown_it_py'   : 'native'
+        'APPLICATION.products.mdurl'            : 'native'
+        'APPLICATION.products.meshio'           : 'native'
+        'APPLICATION.products.netCDF4'          : 'native'
+        'APPLICATION.products.rich'             : 'native'
         'APPLICATION.products.opencv'           : {tag: '3.2.0',     base: 'no', section: 'version_3_2_0_DB12'}
         'APPLICATION.products.cminpack'         : 'native'
         'APPLICATION.products.root'             : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_DB12'}
@@ -316,11 +329,11 @@ __overwrite__ :
         __condition__ : "VARS.dist in ['FD32']"
         'APPLICATION.products.opencv'           : '3.2.0'
         'APPLICATION.products.qwt'              : '6.1.4'
-        'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'   }
-        'APPLICATION.products.Sphinx'           : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' }
-        'APPLICATION.products.gdal'             : {tag:'2.4.0',  base: 'no', section: 'version_2_4_0_FD32'   } # spns #29324
-        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2'        }
-        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'      }
+        'APPLICATION.products.PyFMI'            : {tag: '2.6',    base: 'no', section: 'version_2_6_no_pip'   }
+        'APPLICATION.products.Sphinx'           : {tag: '1.7.6',  base: 'no', section: 'version_1_7_6_no_pip' }
+        'APPLICATION.products.gdal'             : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'   } # spns #29324
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2',  base: 'no', section: 'version_0_1_2_no_pip' }
+        'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'       }
     }
     {
         __condition__ : "VARS.dist in ['FD34']"

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 57e68d3d3d6b7819330a48f26db19427091b1926..552af72bb268a0ebfdd62a826b8c4df767e06c19 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -43,6 +43,7 @@ APPLICATION :
         catalyst: '2.0'
         C3PO: 'v2.3'
         certifi : '2018.8.24'
+        cftime: '1.6.3'
         cgns : '4.2.0'
         chardet : '3.0.4'
         charset_normalizer : '3.3.2'
@@ -69,6 +70,7 @@ APPLICATION :
         gdal : '2.4.0'
         gmsh : '4.10.3'
         graphviz : '2.38.0'
+        h5py : '3.11.0'
         hdf5 : '1.10.3'
         idna : '2.7'
         imagesize : '1.4.1'
@@ -81,16 +83,20 @@ APPLICATION :
         libxml2 : '2.9.12'
         llvm : '8.0.1-clang'
         markupsafe : '2.1.5'
+        markdown_it_py: '3.0.0'
         matplotlib : '3.8.2'
+        mdurl: '0.1.2'
         medfile : '4.1.1'
         mesa : '19.0.8'
         MeshGems : '2.15-1'
-        mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} 
+        meshio : '5.3.5'
+        mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'}
         metis : '5.1.0'
         netgen : '5.3.1_with_CAS_7.2'
         # comment out line above and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
         netcdf : '4.6.2'
+        netCDF4 : '1.6.5'
         nlopt : '2.5.0'
         nose: '1.3.7'
         numpy : '1.21.1'
@@ -122,6 +128,7 @@ APPLICATION :
         qt : '5.12.10'
         qwt : '6.1.2'
         requests : '2.31.0'
+        rich : '13.7.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
         salome_system : 'native'

diff --git a/products/cftime.pyconf b/products/cftime.pyconf
index 7426fbfd97614cbe7887398d3afcd4125fff1f7a..f2d06de9c232663d4f9d93176dd65e200d62d7be 100644 (file)
--- a/products/cftime.pyconf
+++ b/products/cftime.pyconf
@@ -2,21 +2,21 @@ default :
 {
     name : "cftime"
     build_source : "script"
-    compil_script: "cftime.sh"
+    compil_script :  'pip_install' + $VARS.scriptExtension
     get_source : "archive"  
     patches : []
     system_info : 
     {
         rpm : []
         rpm_dev : []
-        apt : []
+        apt : ['python3-cftime']
         apt_dev : []
     }
     environ :
     {
        env_script : "cftime.py"
     }
-    depend : ['Python', 'h5py', 'rich', 'netcdf']
+    depend : ['Python','setuptools']
     opt_depend: []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -30,7 +30,7 @@ default :
 
 default_win :
 {
-    depend : ['Python', 'h5py', 'rich', 'netcdf']
+    depend : ['Python', 'setuptools']
     opt_depend : []
     properties :
     {
@@ -43,6 +43,16 @@ version_1_6_3 :
 {
 }
 
+version_1_6_3_no_pip :
+{
+    compil_script: "cftime.sh"
+    properties :
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}
+
 version_1_6_3_win :
 {
     compil_script: "cftime-1.6.3.bat"

diff --git a/products/h5py.pyconf b/products/h5py.pyconf
index 66c4870eeff0b09c6ac04172678ff426c97204a9..d8ffc615df2b89d6facf41a444b135c010287b56 100644 (file)
--- a/products/h5py.pyconf
+++ b/products/h5py.pyconf
@@ -7,7 +7,7 @@ default :
     patches : []
     system_info : 
     {
-        rpm : ["h5py"]
+        rpm : [python3-h5py]
         rpm_dev : []
         apt : ["python3-h5py"]
         apt_dev : []
@@ -24,11 +24,11 @@ default :
     properties :
     {
       incremental : "yes"
-      pip : "no"
+      pip : "yes"
     }
 }
 
-version_3_11_0:
+version_3_11_0_no_pip:
 {
    compil_script: "h5py-3.11.0"  + $VARS.scriptExtension
    archive_info : {archive_name : "h5py-3.11.0-x86_64.tar.gz"}

diff --git a/products/markdown_it_py.pyconf b/products/markdown_it_py.pyconf
index f2e4cb945c4fbf006d2a878efb4928bc5d214a35..0d3e1fd9a5b92bbb2f2f4690152aa723acfc7780 100644 (file)
--- a/products/markdown_it_py.pyconf
+++ b/products/markdown_it_py.pyconf
@@ -1,8 +1,8 @@
 default :
 {
-    name : "markdown_it_py"
+    name : "markdown-it-py"
     build_source : "script"
-    compil_script: "markdown-it-py.sh"
+    compil_script :  'pip_install' + $VARS.scriptExtension
     get_source : "archive"  
     patches : []
     system_info : 
@@ -16,7 +16,7 @@ default :
     {
        env_script : "markdown_it_py.py"
     }
-    depend : ['Python', 'h5py', 'mdurl']
+    depend : ['Python', 'setuptools', 'mdurl']
     opt_depend: []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -28,7 +28,7 @@ default :
     }
 }
 
-version_3_0_0:
+version_3_0_0_no_pip:
 {
    compil_script: "markdown-it-py-3.0.0"  + $VARS.scriptExtension
    archive_info : {archive_name : "markdown-it-py-3.0.0-x86_64.tar.gz"}

diff --git a/products/mdurl.pyconf b/products/mdurl.pyconf
index ba3629d38d13ac7e6824cf4fa72e664bf8b3c2bd..627234b7f40b662b6a548e7cf46e8c40fc3dc3f5 100644 (file)
--- a/products/mdurl.pyconf
+++ b/products/mdurl.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "mdurl"
     build_source : "script"
-    compil_script: "mdurl.sh"
+    compil_script : 'pip_install' + $VARS.scriptExtension
     get_source : "archive"  
     patches : []
     system_info : 
@@ -16,7 +16,7 @@ default :
     {
        env_script : "mdurl.py"
     }
-    depend : ['Python', 'h5py']
+    depend : ['Python', 'setuptools']
     opt_depend: []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -28,7 +28,7 @@ default :
     }
 }
 
-version_0_1_2:
+version_0_1_2_no_pip:
 {
    compil_script: "mdurl-0.1.2"  + $VARS.scriptExtension
    archive_info : {archive_name : "mdurl-0.1.2-x86_64.tar.gz"}

diff --git a/products/meshio.pyconf b/products/meshio.pyconf
index 3b30590426f2164251327cf065ab8643d38d4097..5ed07cd01466ed9914470ee51f5a5af14e4a44ec 100644 (file)
--- a/products/meshio.pyconf
+++ b/products/meshio.pyconf
@@ -9,14 +9,14 @@ default :
     {
         rpm : []
         rpm_dev : []
-        apt : []
+        apt : ['python3-meshio', 'meshio-tools']
         apt_dev : []
     }
     environ :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'numpy', 'hdf5', 'h5py', 'netcdf', 'rich', 'netCDF4']
+    depend : ['Python', 'setuptools', 'importlib_metadata', 'numpy', 'h5py', 'rich', 'netCDF4']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
@@ -29,6 +29,10 @@ default :
 }
 
 version_5_3_5 :
+{
+}
+
+version_5_3_5_no_pip :
 {
    compil_script: "meshio-5.3.5"  + $VARS.scriptExtension
    archive_info : {archive_name : "meshio-5.3.5-x86_64.tar.gz"}

diff --git a/products/netCDF4.pyconf b/products/netCDF4.pyconf
index e260759c4d0ffd2aec9082882ebdc7b42086652e..f82ff06f39009e109663537fd40a4729fe9fe9e2 100644 (file)
--- a/products/netCDF4.pyconf
+++ b/products/netCDF4.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "netCDF4"
     build_source : "script"
-    compil_script: "netCDF4.sh"
+    compil_script :  'pip_install' + $VARS.scriptExtension
     get_source : "archive"  
     patches : []
     system_info : 
@@ -16,7 +16,7 @@ default :
     {
        env_script : "netCDF4.py"
     }
-    depend : ['Python', 'netcdf', 'hdf5', 'cftime']
+    depend : ['Python', 'setuptools', 'netcdf', 'cftime', 'certifi']
     opt_depend: []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -42,6 +42,16 @@ version_1_6_5 :
 {
 }
 
+version_1_6_5_no_pip:
+{
+    compil_script: "netCDF4.sh"
+    properties :
+    {
+      incremental : "yes"
+      pip : "yes"
+    }
+}
+
 version_1_6_5_win :
 {
     compil_script: "netCDF4-1.6.5.bat"

diff --git a/products/rich.pyconf b/products/rich.pyconf
index 66eba410645b597e2b0c0cffafb29223e439bec2..7103f9e15b011f4ba1b678f108a8cc0891ae9adf 100644 (file)
--- a/products/rich.pyconf
+++ b/products/rich.pyconf
@@ -2,22 +2,21 @@ default :
 {
     name : "rich"
     build_source : "script"
-    compil_script: "rich"  + $VARS.scriptExtension
+    compil_script :  'pip_install' + $VARS.scriptExtension
     get_source : "archive"
     patches : []
     system_info : 
     {
         rpm : ['python3-rich']
-        rpm_dev : ['python3-rich']
+        rpm_dev : []
         apt : ['python3-rich']
-        apt_dev : ['python3-rich']
+        apt_dev : []
     }
     environ :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'numpy', 'hdf5', 'h5py']
-    opt_depend: ['openmpi']
+    depend : ['Python', 'setuptools', 'markdown_it_py', 'Pygments']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
@@ -28,14 +27,13 @@ default :
     }
 }
 
-version_13_7_1:
+version_13_7_1_no_pip:
 {
-    depend : ['Python', 'numpy', 'hdf5', 'h5py', 'markdown_it_py', 'Pygments']
+    compil_script: "rich-13.7.1"  + $VARS.scriptExtension
     archive_info :
     {
       archive_name  : "rich-13.7.1-x86_64.tar.gz"
     }
-    compil_script: "rich-13.7.1"  + $VARS.scriptExtension
     properties :
     {
       incremental : "yes"

diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index de6c047db72e02e163f17bb2bb5bee9ef07adb3b..5a5923a8de22ed1d57ae737c8892f6e022d16187 100644 (file)
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -105,7 +105,7 @@ default :
         {
             apt : ["libdc1394-25", "libopenexr-3-1-30", "libwebp7", "libgfortran5", "libevent-2.1-7", "libpng16-16", "libgcc",
                    "libffi8", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp25",
-                   "openmpi-bin", "libnetcdf19", "libgdal32", "libtbb12", "python3-setuptools", "libxml++2.6-2v5"]
+                   "openmpi-bin", "libnetcdf19", "libgdal32", "libtbb12", "python3-setuptools", "libxml++2.6-2v5", "liblzf1"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
                        "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev",
                        "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev",