From c44d2004bbed20df0a0cf45158b592ac904ee2fa Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Wed, 21 Feb 2024 14:46:21 +0100 Subject: [PATCH] spns #40691: target CONFIGURATION master --- applications/SALOME-master-native.pyconf | 5 +---- applications/SALOME-master.pyconf | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index dac1dd8..d85494a 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -138,7 +138,7 @@ APPLICATION : URANIE : '4.7.0' # SALOME MODULES : - 'CONFIGURATION' : 'mbs/update_labels' + 'CONFIGURATION' 'SALOME' 'SHAPER' 'SHAPERSTUDY' @@ -248,7 +248,6 @@ __overwrite__ : 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.openmpi' : '4.1.5' 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'APPLICATION.products.CONFIGURATION' : 'master' } { __condition__ : "VARS.dist in ['DB11']" @@ -256,7 +255,6 @@ __overwrite__ : 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'APPLICATION.products.CONFIGURATION' : 'master' } { __condition__ : "VARS.dist in ['DB12']" @@ -270,7 +268,6 @@ __overwrite__ : 'APPLICATION.products.nlopt' : '2.5.0' 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB12' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB12', hpc: 'yes' } - 'APPLICATION.products.CONFIGURATION' : 'master' } { # CentOS 8 repositories don't include sphinxintl package which must be installed through pip. diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 76ffeb1..5177285 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -141,7 +141,7 @@ APPLICATION : URANIE : '4.7.0' # SALOME MODULES : - 'CONFIGURATION' : 'mbs/update_labels' + 'CONFIGURATION' 'SALOME' 'SHAPER' 'SHAPERSTUDY' @@ -231,7 +231,6 @@ __overwrite__ : 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8' } # spns #29324 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'} 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_CO8' } - 'APPLICATION.products.CONFIGURATION' : 'master' } { __condition__ : "VARS.dist in ['DB10']" @@ -242,7 +241,6 @@ __overwrite__ : __condition__ : "VARS.dist in ['DB09']" 'APPLICATION.products.openturns' : {tag: '1.21', base: 'no', section: 'version_1_21_DB09' } 'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'APPLICATION.products.CONFIGURATION' : 'master' } { __condition__ : "VARS.dist in ['UB18.04']" -- 2.30.2