From 5b3bb2b3a9eff2c7a6ef674bdffb35a883854d90 Mon Sep 17 00:00:00 2001 From: Nicolas OTTON Date: Fri, 10 Dec 2021 14:41:54 +0100 Subject: [PATCH] added FD34 patch to MEDCOUPLING and fixed typo --- applications/MEDCOUPLING-9.8.0-MPI.pyconf | 2 +- applications/MEDCOUPLING-9.8.0.pyconf | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/applications/MEDCOUPLING-9.8.0-MPI.pyconf b/applications/MEDCOUPLING-9.8.0-MPI.pyconf index 8c21f4b..701a0c2 100644 --- a/applications/MEDCOUPLING-9.8.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.8.0-MPI.pyconf @@ -69,7 +69,7 @@ APPLICATION : # SALOME MODULES : 'CONFIGURATION' - 'MEDCOUPLING' : {tag : 'V9_8_0rc1', section: 'default_MPI'} + 'MEDCOUPLING' : {section: 'default_MPI'} } test_base : { diff --git a/applications/MEDCOUPLING-9.8.0.pyconf b/applications/MEDCOUPLING-9.8.0.pyconf index b9fa520..6774d9c 100644 --- a/applications/MEDCOUPLING-9.8.0.pyconf +++ b/applications/MEDCOUPLING-9.8.0.pyconf @@ -85,7 +85,11 @@ APPLICATION : __overwrite__ : [ { - __condition__ : "VARS.dist in ['FD32']" + __condition__ : "VARS.dist in ['FD32', 'FD34']" 'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version } -] + { + __condition__: "VARS.dist in ['FD34']" + 'PRODUCTS.Python.version_3_6_5.patches' : ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 + } +] \ No newline at end of file -- 2.39.2