MEDCOUPLING-9.10.0-MPI special treatment for scipy on more recent platforms

diff --git a/applications/MEDCOUPLING-9.10.0-MPI.pyconf b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
index 1ae0c9d7d45a2bc4cba392cf8af4914d8029061f..d33943e7ca815f2e71904d17fae97f3c8cd69e4d 100644 (file)
--- a/applications/MEDCOUPLING-9.10.0-MPI.pyconf
+++ b/applications/MEDCOUPLING-9.10.0-MPI.pyconf
@@ -88,4 +88,24 @@ APPLICATION :
 }
 __overwrite__ :
 [
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+        # https://github.com/pyenv/pyenv/issues/1889
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'}
+    }
+    {
+        __condition__ : "VARS.dist in ['DB11']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
 ]

diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf
index ff52e2aceeca62285cf42ab9b0ae07729b2d21f7..7aae3876dbed4bdbd1a21459742cf5c769cd3a6a 100644 (file)
--- a/applications/MEDCOUPLING-master-MPI.pyconf
+++ b/applications/MEDCOUPLING-master-MPI.pyconf
@@ -88,4 +88,24 @@ APPLICATION :
 }
 __overwrite__ :
 [
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+        # https://github.com/pyenv/pyenv/issues/1889
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'}
+    }
+    {
+        __condition__ : "VARS.dist in ['DB11']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
 ]