From 9c5a492703bc8ae1c7de7d354fb729f062ee05ec Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Mon, 23 Oct 2023 09:32:53 +0200 Subject: [PATCH] Fix override and add patches for ParaView --- applications/SALOME-master-native.pyconf | 22 +++++++++++----------- products/ParaView.pyconf | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 7917370..ece8295 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -273,17 +273,17 @@ __overwrite__ : 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.openmpi' : '4.1.5' - 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9' } - 'APPLICATION.products.qt' : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9' } - 'APPLICATION.products.sip' : {tag: '5.5.0', base: 'no', section: 'version_5_5_0_CO9' } - 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } - 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } - 'APPLICATION.products.numpydoc' : {tag: '0.9.0', base: 'no', section: 'version_0_9_0_no_pip' } - 'APPLICATION.products.pandas' : {tag: '1.1.5', base: 'no', section: 'version_1_1_5_no_pip' } - 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } - #'APPLICATION.products.openturns' : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO8' } - 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } - 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9' } + 'APPLICATION.products.qt' : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9' } + 'APPLICATION.products.sip' : {tag: '5.5.0', base: 'no', section: 'version_5_5_0_CO9' } + 'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip' } + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } + 'APPLICATION.products.numpydoc' : {tag: '0.9.0', base: 'no', section: 'version_0_9_0_no_pip' } + 'APPLICATION.products.pandas' : {tag: '1.1.5', base: 'no', section: 'version_1_1_5_no_pip' } + 'APPLICATION.products.statsmodels' : {tag: '0.6.1', base: 'no', section: 'version_0_6_1_no_pip' } + 'APPLICATION.products.nose' : {tag: '1.3.7', base: 'no', section: 'version_1_3_7_no_pip' } + 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'} + 'APPLICATION.products.YACS' : {tag: 'master', base: 'no', section: 'default_CO9' } } { __condition__ : "VARS.dist in ['FD32']" diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 7ab15e0..7d806dd 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -438,7 +438,8 @@ version_5_11_0_MPI_CO9 : patches : ['paraview-5.11.0.p001-FindCGNS.patch', 'paraview-5.11.0.p002-FindMPI.patch', 'paraview-5.11.0.p003-ParaViewClient.patch', - 'paraview-5.11.0.p006-GIL.patch' + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p009-openturns-1.21.patch' ] depend : [ 'Python', -- 2.39.2