apply changes from master

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

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 1a511f5085d3e4415d8fbd46abdf4a9746374e6d..0cf0801d70ea750ce80ea8c82ba6d9f72b12e171 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -62,7 +62,7 @@ APPLICATION :
         gmp : 'native'
         mpfr : 'native'
         gdal : '2.4.0'
-        gmsh : '4.8.4'
+        gmsh : '4.10.3'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
         idna : '2.7'
@@ -102,7 +102,7 @@ APPLICATION :
         PERSALYS: 'v12.0'
         petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
         Pillow : '8.4.0'
-        planegcs : '0.18-3cb6890'
+        planegcs : '0.20'
         psutil : '5.7.2'
         PyFMI : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'}
         Pygments : '2.0.2'
@@ -134,6 +134,7 @@ APPLICATION :
         tcl : '8.6.0'
         tk : '8.6.0'
         toml: '0.10.2'
+        TTK : 'f8dafde2d7'
         urllib3 : '1.23'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -143,7 +144,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : 'V2_4_5'
+        'LIBBATCH' : 'V2_4_6'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI' : 'po/pv-master'
@@ -205,6 +206,10 @@ APPLICATION :
 }
 __overwrite__ :
 [
+    {
+        __condition__ : "VARS.dist not in ['DB09']"
+        'APPLICATION.rm_products' : ['TTK']
+    }
     {
         __condition__ : "VARS.dist not in ['DB09','DB10', 'DB11']"
         'APPLICATION.products.MeshGems' : {tag : '2.13-1', hpc : 'yes', base: 'no'}