X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master.pyconf;h=53216fcf2b1b2b7ee7d2e60a4fb0ee68108abdff;hb=117f1a5cd6138c104d0ff11386ba81bf236334af;hp=d28b801891015d5a5ff27a3214252eaf15a19dc8;hpb=bd97f1cd1ba9c70b69d3f0e7d6325ae8509c3598;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index d28b801..53216fc 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -36,13 +36,15 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : 'V7_5_3p2'
+        #CAS : 'CR753-SALOME-PATCH'
+        CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
+        catalyst: '2.0'
         C3PO: 'v2.0'
         certifi : '2018.8.24'
         cgns : '4.2.0'
         chardet : '3.0.4'
         click : '6.7'
-        cmake : '3.12.1'
+        cmake : '3.24.2'
         cminpack: '1.3.6'
         cppunit : '1.13.2'
         cycler : '0.10.0'
@@ -57,7 +59,6 @@ APPLICATION :
         freetype : '2.9.1'
         gcc  :  '8.5.0'
         mpc : 'native'
-        mpi4py: '3.0.3'
         gmp : 'native'
         mpfr : 'native'
         gdal : '2.4.0'
@@ -73,35 +74,37 @@ APPLICATION :
         libxml2 : '2.9.1'
         llvm : '8.0.1-clang'
         markupsafe : '0.23'
-        matplotlib : '3.0.3'
+        matplotlib : '3.3.4'
         medfile : '4.1.1'
         mesa : '19.0.8'
         MeshGems : '2.14-4'
+        mpi4py: '3.0.3'
         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'
         nlopt : '2.5.0'
         nose: '1.3.7'
         numpy : '1.16.4'
         numpydoc : '0.9.0'
-        omniORB : '4.2.2'
-        omniORBpy : '4.2.2'
+        omniORB : '4.2.5'
+        omniORBpy : '4.2.5'
         opencv : '3.2.0'
         openmpi : '3.1.6'
-        openturns: '1.18'
+        openturns: '1.19'
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
         pandas : '0.25.2'
         patsy : '0.5.2'
-        ParaView : {tag:'5.9.0', base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        ParaView : {tag:'08c5d057a8', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
         PERSALYS: 'v12.0'
-        petsc : {tag : '3.16.0', section: 'version_3_16_0'}
-        Pillow : '7.1.1'
+        petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
+        Pillow : '8.4.0'
         planegcs : '0.18-3cb6890'
         psutil : '5.7.2'
-        PyFMI : '2.5'
+        PyFMI : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'}
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.15.3'
@@ -130,7 +133,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        TopIIVolMesh
+        toml: '0.10.2'
         urllib3 : '1.23'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -140,7 +143,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_5'}
+        'LIBBATCH' : 'V2_4_5'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
@@ -157,12 +160,10 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'OPENTURNS_SALOME'
         'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -176,20 +177,18 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
+        'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
-        'TESTBASE': {tag: 'master'}
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'TopIIVolMesh'
+        #'TESTBASE'
+        'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {
         launcher_name : "salome"
     }
-    virtual_app:
-    {
-        name : "salome"
-        application_name : "APPLI"
-    }
     test_base : 
     {
         name : "SALOME"
@@ -206,6 +205,10 @@ APPLICATION :
 }
 __overwrite__ :
 [
+    {
+        __condition__ : "VARS.dist not in ['DB09','DB10', 'DB11']"
+        'APPLICATION.products.MeshGems' : {tag : '2.13-1', hpc : 'yes', base: 'no'}
+    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -240,9 +243,4 @@ __overwrite__ :
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324
     }
-
-    {
-        __condition__ : "VARS.dist not in ['DB09', 'DB10', 'DB11']"
-        'APPLICATION.products.MeshGems' : '2.13-1'
-    }
 ]