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

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 2fafd26791884262c3c91e58cc193283ce241243..3805d7f9a49f68104c9f8f1d01f5b9318f723b85 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -72,7 +72,7 @@ APPLICATION :
         opencv : '3.2.0'
         openmpi : '3.1.6'
         openssl : "native"
-        openturns: '1.16'
+#        openturns: '1.16'
         ospray : '1.8.4'
         packaging : '17.1'
         ParaView : {tag : '5.8.0', hpc : 'yes', section: 'version_5_8_0_MPI'}
@@ -107,7 +107,7 @@ APPLICATION :
         tcl : '8.6.0'
         tk : '8.6.0'
         urllib3 : '1.23'
-        URANIE : '4.5.0'
+#        URANIE : '4.5.0'
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
@@ -115,7 +115,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_4_4'}
-        'KERNEL' : {section : 'default_MPI', verbose : 'yes', tag : 'occ/psutil'}
+        'KERNEL' : {section : 'default_MPI', verbose : 'yes'}
         'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
         'GUI' : {verbose : 'yes'}
         'GEOM'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 4c9490493951881b323f01c8d17bb1b52479bd24..c606541e10f2458c0baec9904b6f583e427effe5 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -52,10 +52,10 @@ APPLICATION :
         f2c : '1.0.0'
         freeimage : '3.18.0'
         freetype : '2.9.1'
-        #gmsh : '4.1.4'
+#        gmsh : '4.1.4'
         graphviz : '2.44.1'
         hdf5 : '1.10.3'
-        #homard_bin : '11.12'
+#        homard_bin : '11.12'
         idna : '2.8'
         imagesize : '1.1.0'
         ispc : '1.10.0'
@@ -79,7 +79,7 @@ APPLICATION :
         omniORB : '4.2.3'
         omniORBpy : '4.2.3'
         opencv : '3.2.0'
-        #openturns: '1.16'
+#        openturns: '1.16'
         ospray : '1.8.4'
         packaging : '19.0'
         ParaView : '5.8.0'
@@ -120,7 +120,7 @@ APPLICATION :
         tbb : '2019_U8_win'
         tcltk : '8.6.9'
         urllib3 : '1.25.3'
-        #URANIE : '4.5.0'
+#        URANIE : '4.5.0'
         zlib : '1.2.5'
 
         # SALOME MODULES :
@@ -130,7 +130,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag :'V2_4_4'}
-        'KERNEL' : {tag : 'occ/psutil'}
+        'KERNEL'
         'MEDCOUPLING'
         'GUI'
         'GEOM'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index b2bb7ff435411da21bd14f5769133f8fbda5132e..6f543a433c8b9b4cf4e3cb9ddeeaf0285fe07f05 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -71,7 +71,7 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openssl : "native"
-        #openturns: '1.16'
+#        openturns: '1.16'
         ospray : '1.8.4'
         packaging : '17.1'
         ParaView : '5.8.0'
@@ -106,7 +106,7 @@ APPLICATION :
         tcl : '8.6.0'
         tk : '8.6.0'
         urllib3 : '1.23'
-        #URANIE : '4.5.0'
+#        URANIE : '4.5.0'
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
@@ -114,7 +114,7 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_4'}
-        'KERNEL' : {tag : 'occ/psutil'}
+        'KERNEL'
         'MEDCOUPLING'
         'GUI'
         'GEOM'