Switch back KERNEL to master after validating psutil use from a dev branch

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

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 450820f09bc4f620345021efe604837fe2ad2ea1..6f543a433c8b9b4cf4e3cb9ddeeaf0285fe07f05 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -30,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.58.0'
-        CAS : 'CR740-SALOME-PATCH'
+        CAS : 'V7_5_0'
         certifi : '2018.8.24'
         cgns : '3.3.1'
         chardet : '3.0.4'
@@ -49,6 +49,7 @@ APPLICATION :
         gmsh : '4.1.4'
         graphviz : '2.38.0'
         hdf5 : '1.10.3'
+        homard_bin : '11.12_hdf51103med410'
         idna : '2.7'
         imagesize : '1.0.0'
         ispc : '1.9.2'
@@ -70,13 +71,14 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openssl : "native"
+#        openturns: '1.16'
         ospray : '1.8.4'
         packaging : '17.1'
         ParaView : '5.8.0'
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -87,6 +89,7 @@ APPLICATION :
         qt : '5.9.1'
         qwt : '6.1.2'
         requests : '2.19.1'
+        root: '6.22.02'
         scipy : '0.19.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -94,16 +97,16 @@ APPLICATION :
         six : '1.10.0'
         snowballstemmer : '1.2.1'
         Sphinx : '1.7.6'
-        sphinxcontrib_napoleon : '0.6.1'
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
+        StaticMeshPlugin : '5.8.0'
         swig : '3.0.12'
         tbb : 'native'
         tcl : '8.6.0'
         tk : '8.6.0'
         urllib3 : '1.23'
-
+#        URANIE : '4.5.0'
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
@@ -125,8 +128,8 @@ APPLICATION :
         'GMSHPLUGIN'
         'HEXABLOCK'
         'HEXABLOCKPLUGIN'
-        'HOMARD' : {tag : 'gn/evol_01'}
-        'FIELDS' : {tag : 'nct/helpmenu'}
+        'HOMARD'
+        'FIELDS'
         'PARAVIS'
         'JOBMANAGER'
         'YACS'
@@ -144,7 +147,7 @@ APPLICATION :
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
-        'PARAVISADDONS' : {tag: 'spns/20440'}
+        'PARAVISADDONS'
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -201,6 +204,13 @@ __overwrite__ :
     'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
   }
 
+  {
+    # Build Fedora 30 with less permissive compilation flags (see spns #18962)
+    __condition__ : "VARS.dist in ['FD30']"
+    'PRODUCTS.LIBBATCH.default.cmake_options' : "-DLIBBATCH_DEBUG_WARNINGS=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    'PRODUCTS.CONFIGURATION.default.patches' : ['CONFIGURATION-SALOME-DEBUG-WARNINGS.patch']
+  }
+
   {
     __condition__ : "VARS.dist in ['FD32']"
     'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version
@@ -210,6 +220,11 @@ __overwrite__ :
     'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
   }
 
+  {
+    __condition__ : "VARS.dist in ['CO7']"
+    'APPLICATION.products.tbb' : '2019_U8'
+  }
+
   {
     __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'"
     'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch',
@@ -226,7 +241,7 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
-    'APPLICATION.products.tbb' : '4.4'
+    'APPLICATION.products.tbb' : '2019_U8'
   }
 
   {