Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 10c24a773bb6ab8fee4a23933bd126bb26a2a0c4..6f543a433c8b9b4cf4e3cb9ddeeaf0285fe07f05 100644
(file)
--- a/
applications/SALOME-master.pyconf
+++ b/
applications/SALOME-master.pyconf
@@
-49,6
+49,7
@@
APPLICATION :
gmsh : '4.1.4'
graphviz : '2.38.0'
hdf5 : '1.10.3'
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'
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"
omniORBpy : '4.2.2'
opencv : '3.2.0'
openssl : "native"
+# openturns: '1.16'
ospray : '1.8.4'
ospray : '1.8.4'
- #openturns: '1.16'
packaging : '17.1'
ParaView : '5.8.0'
petsc : '3.14.0'
Pillow : '7.1.1'
planegcs : '0.18-3cb6890'
packaging : '17.1'
ParaView : '5.8.0'
petsc : '3.14.0'
Pillow : '7.1.1'
planegcs : '0.18-3cb6890'
+ psutil : '5.7.2'
Pygments : '2.0.2'
pyparsing : '2.0.3'
PyQt : '5.9'
Pygments : '2.0.2'
pyparsing : '2.0.3'
PyQt : '5.9'
@@
-87,7
+89,7
@@
APPLICATION :
qt : '5.9.1'
qwt : '6.1.2'
requests : '2.19.1'
qt : '5.9.1'
qwt : '6.1.2'
requests : '2.19.1'
-
#
root: '6.22.02'
+ root: '6.22.02'
scipy : '0.19.1'
scotch : '6.0.4'
setuptools : '38.4.0'
scipy : '0.19.1'
scotch : '6.0.4'
setuptools : '38.4.0'
@@
-98,12
+100,13
@@
APPLICATION :
sphinxcontrib_websupport : '1.1.0'
sphinx_rtd_theme : '0.4.3'
sphinxintl: '0.9.10'
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'
swig : '3.0.12'
tbb : 'native'
tcl : '8.6.0'
tk : '8.6.0'
urllib3 : '1.23'
-
#
URANIE : '4.5.0'
+
#
URANIE : '4.5.0'
# SALOME MODULES :
'CONFIGURATION'
'SALOME'
# SALOME MODULES :
'CONFIGURATION'
'SALOME'
@@
-125,7
+128,7
@@
APPLICATION :
'GMSHPLUGIN'
'HEXABLOCK'
'HEXABLOCKPLUGIN'
'GMSHPLUGIN'
'HEXABLOCK'
'HEXABLOCKPLUGIN'
- 'HOMARD'
: {tag : 'gn/evol_01'}
+ 'HOMARD'
'FIELDS'
'PARAVIS'
'JOBMANAGER'
'FIELDS'
'PARAVIS'
'JOBMANAGER'
@@
-219,7
+222,7
@@
__overwrite__ :
{
__condition__ : "VARS.dist in ['CO7']"
{
__condition__ : "VARS.dist in ['CO7']"
- 'APPLICATION.products.tbb' : '
4.4
'
+ 'APPLICATION.products.tbb' : '
2019_U8
'
}
{
}
{
@@
-238,7
+241,7
@@
__overwrite__ :
{
__condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
{
__condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
- 'APPLICATION.products.tbb' : '
4.4
'
+ 'APPLICATION.products.tbb' : '
2019_U8
'
}
{
}
{