bos #42105 [CEA 41965]: move to qt 5.15.2 and qwt 6.1.6

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

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 283fd117d29ee1023b05d6e26a80d11dfac6e017..c7a5166af5874c0e17e65b1be5ef28dbc7c56dca 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -84,6 +84,8 @@ APPLICATION :
         meshio: '5.3.5'
         metis : 'native'
         mpi4py: 'native'
+        mmg : '5.6.0'
+        mmgplugin: 'main'
         netgen : '5.3.1_with_CAS_7.8'
         # comment out line above and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
@@ -205,7 +207,7 @@ APPLICATION :
     properties :
     {
         mesa_launcher_in_package : "yes"
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "no"
@@ -256,8 +258,8 @@ __overwrite__ :
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.hdf5'     : 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.6',     base: 'no',  section: 'version_2_6_no_pip'                 }
-        'APPLICATION.products.qt'       : '5.12.10'
-        'APPLICATION.products.qwt'      : '6.1.2'
+        'APPLICATION.products.qt'       : '5.15.2'
+        'APPLICATION.products.qwt'      : '6.1.6'
         'APPLICATION.products.PyQt'     : '5.15.3'
         'APPLICATION.products.sip'      : '5.5.0'
         'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no',  section: 'version_5_11_0_MPI_DB10', hpc: 'yes'}
@@ -322,14 +324,14 @@ __overwrite__ :
          __condition__ : "VARS.dist in ['CO9']"
          'APPLICATION.products.nlopt'            : '2.4.2'
          'APPLICATION.products.cminpack'         : '1.3.6'
-         'APPLICATION.products.qwt'              : '6.1.2'
+         'APPLICATION.products.qwt'              : '6.1.6'
          'APPLICATION.products.PyQt'             : '5.15.3'
          'APPLICATION.products.swig'             : '4.0.2'
          'APPLICATION.products.opencv'           : '3.2.0'
          'APPLICATION.products.openmpi'          : '4.1.5'
          'APPLICATION.products.sip'              : '5.5.0'
          'APPLICATION.products.root'             : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9'               }
-         'APPLICATION.products.qt'               : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9'               }
+         'APPLICATION.products.qt'               : '5.15.2'
          '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'             }
@@ -347,12 +349,17 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['FD32']"
         'APPLICATION.products.opencv'           : '3.2.0'
-        'APPLICATION.products.qwt'              : '6.1.4'
+        'APPLICATION.products.qt'               : '5.15.2'
+        'APPLICATION.products.qwt'              : '6.1.6'
         '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'       }
+        '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'}
     }
     {
         __condition__ : "VARS.dist in ['FD34']"
@@ -418,7 +425,7 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_FD38'                    }
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'                  }
         'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                    }
-        'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_FD38'                 }
+        'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_with_CAS_7_8_FD38'    }
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
     }
 ]