From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 4 Oct 2022 10:22:17 +0000 (+0200)
Subject: apply changes from master
X-Git-Tag: V9_11_0~268
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0f7472010f19b01204e15a1c5421a4a6157e48bc;p=tools%2Fsat_salome.git

apply changes from master
---

0f7472010f19b01204e15a1c5421a4a6157e48bc
diff --cc applications/SALOME-master-native.pyconf
index f78a53d,07fdd88..b910bb2
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@@ -99,9 -98,9 +99,9 @@@ APPLICATION 
          PERSALYS: 'v12.0'
          petsc : {tag : '3.16.0', section: 'version_3_16_0'}
          Pillow : 'native'
-         planegcs : '0.18-3cb6890'
+         planegcs : '0.20'
          psutil : 'native'
 -        PyFMI : '2.5'
 +        PyFMI : '2.6'
          Pygments : 'native'
          pyparsing : 'native'
          PyQt : 'native'
@@@ -141,12 -139,12 +141,12 @@@
          'SHAPER'
          'SHAPERSTUDY'
          'RESTRICTED'
-         'LIBBATCH' : {tag : 'V2_4_5'}
+         'LIBBATCH' : {tag : 'V2_4_6'}
          'KERNEL'
          'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
 -        'GUI'
 +        'GUI' : 'po/pv-master'
          'GEOM'
 -        'SMESH'
 +        'SMESH' : 'po/pv-master'
          'NETGENPLUGIN'
          'BLSURFPLUGIN'
          'GHS3DPLUGIN'
diff --cc applications/SALOME-master-windows.pyconf
index c3b28bc,b08dce0..746b2a1
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@@ -89,13 -89,13 +89,13 @@@ APPLICATION 
          omniORBpy : '4.2.3'
          opencv : '3.2.0'
          openVKL: '0.11.0'
 -        openturns: '1.18'
 +        openturns: '1.19'
          ospray : '2.4.0'
          packaging : '19.0'
 -        ParaView : '5.9.0'
 +        ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0'}
          perl : '5.28.1.1'
          Pillow : '7.1.1'
-         planegcs : '0.18-3cb6890'
+         planegcs : '0.20'
          psutil : '5.7.2'
          pthreads : '2.9.1'
          Pygments : '2.4.2'
@@@ -138,12 -138,12 +138,12 @@@
          'SHAPER'
          'SHAPERSTUDY'
          'RESTRICTED'
-         'LIBBATCH' : {tag :'V2_4_5'}
+         'LIBBATCH' : {tag :'V2_4_6'}
          'KERNEL'
          'MEDCOUPLING'
 -        'GUI'
 +        'GUI' : 'po/pv-master'
          'GEOM'
 -        'SMESH'
 +        'SMESH' : 'po/pv-master'
          'NETGENPLUGIN'
          'BLSURFPLUGIN'
          'GHS3DPLUGIN'
diff --cc applications/SALOME-master.pyconf
index 190d37e,b3b3e3a..0cf0801
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@@ -98,13 -97,13 +98,13 @@@ APPLICATION 
          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:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
          PERSALYS: 'v12.0'
          petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
 -        Pillow : '7.1.1'
 +        Pillow : '8.4.0'
-         planegcs : '0.18-3cb6890'
+         planegcs : '0.20'
          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'
@@@ -144,12 -141,12 +144,12 @@@
          'SHAPER'
          'SHAPERSTUDY'
          'RESTRICTED'
-         'LIBBATCH' : 'V2_4_5'
+         'LIBBATCH' : 'V2_4_6'
          'KERNEL'
          'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
 -        'GUI'
 +        'GUI' : 'po/pv-master'
          'GEOM'
 -        'SMESH'
 +        'SMESH' : 'po/pv-master'
          'NETGENPLUGIN'
          'BLSURFPLUGIN'
          'GHS3DPLUGIN'