medcoupling: move back to master

[tools/sat_salome.git] / applications / SALOME-master-native.pyconf

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 58e178f19ec0539e60da6af45c71cc42caaf113b..bfe294020b545b361a5a36dd163eb4a2a621e443 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -32,6 +32,7 @@ APPLICATION :
         Babel : 'native'
         boost : 'native'
         CAS : 'V7_5_3p1'
+        C3PO: 'v2.0'
         certifi : 'native'
         # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
         # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py)
@@ -72,6 +73,7 @@ APPLICATION :
         mesa : 'native'
         MeshGems : '2.14-1'
         metis : 'native'
+        mpi4py: 'native'
         netgen : '6.2.2101'
         nlopt : '2.4.2'
         numpy : 'native'
@@ -119,7 +121,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        topo2volmesh: 'develop'
+        TopIIVolMesh: 'develop'
         urllib3 : 'native'
         URANIE : '4.5.0'
 
@@ -134,7 +136,7 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH' : {tag: 'master', base: 'no', section: 'version_topo2volmesh'}
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -166,7 +168,7 @@ APPLICATION :
         'PARAVISADDONS'
         'YDEFX'
         'TESTBASE': {tag: 'master'}
-        'CEATESTBASE' : {tag: 'SSL'}
+        'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
     {
@@ -193,17 +195,12 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
-        # deeper investigations need to be done in its sources. Use embedded openCV product where
-        # native one is 4.X.
-        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34', 'DB11']"
-        'APPLICATION.products.opencv' : '3.2.0'
-    }
     {
         #
-        __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
-       'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4', hpc: 'yes'}
+        __condition__ : "VARS.dist in ['UB20.04']"
+        'APPLICATION.products.opencv' : '3.2.0'
+        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.PyFMI'    : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'                }
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -212,41 +209,40 @@ __overwrite__ :
         # What is more, ParaView 5.9 CMake procedure requires Qt 5.12 as minimum version (5.11 here).
         # As this version is compliant too, let's force it as the new minimum needed version.
         __condition__ : "VARS.dist in ['DB10']"
-        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10', hpc: 'yes'}
+        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.PyFMI'    : {tag:'2.5',    base: 'no',  section: 'version_2_5_no_pip'}
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'}
     }
     {
         __condition__ : "VARS.dist in ['DB11']"
-        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11', hpc: 'yes'}
+        'APPLICATION.products.opencv' : '3.2.0'
+        'APPLICATION.products.cminpack': 'native'
+        'APPLICATION.products.PyFMI'    : {tag:'2.5',    base: 'no',  section: 'version_2_5_no_pip'            }
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11'}
     }
     {
         # 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.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'}
-        'APPLICATION.products.cmake' : '3.12.1'
+        'APPLICATION.products.sphinxintl'  : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'         }
+        'APPLICATION.products.cminpack'    : '1.3.6'
+        'APPLICATION.products.PyFMI'       : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'             }
+        'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip'           }
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
-        'APPLICATION.products.PyFMI'     : {tag:'2.5',  base:  'no', section: 'version_2_5_no_pip'}
-        'APPLICATION.products.openturns' : {tag:'1.17', base:  'no', section: 'version_1_17_FD32' }
+        'APPLICATION.products.opencv'    : '3.2.0'
+        'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'              }
+        'APPLICATION.products.openturns' : {tag: '1.17',  base: 'no', section: 'version_1_17_FD32'               }
+
     }
     {
         # FD 34 qt5 package is qt5-qtbase-devel.
         __condition__ : "VARS.dist in ['FD34']"
+        'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
         'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
     }
-    {
-        __condition__ : "VARS.dist in ['DB10', 'DB11', 'UB20.04']"
-        'APPLICATION.products.cminpack': 'native'
-        'APPLICATION.products.PyFMI'    : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'}
-    }
-    {
-        __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.cminpack'    : '1.3.6'
-        'APPLICATION.products.PyFMI'       : {tag:'2.5',   base: 'no',  section: 'version_2_5_no_pip'  }
-        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section: 'version_0_6_1_no_pip'}
-    }
 ]