From 23d65dc0ae2aa4a4aa46943157bee93923e19355 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 4 Jan 2022 17:41:29 +0100
Subject: [PATCH] Align MEDCOUPLING-master-MPI on MEDCOUPLING-9.8.0-MPI

---
 applications/MEDCOUPLING-master-MPI.pyconf    | 23 ++++++++++---------
 .../MEDCOUPLING-master-windows.pyconf         | 14 +++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf
index e6fe746..416c97b 100644
--- a/applications/MEDCOUPLING-master-MPI.pyconf
+++ b/applications/MEDCOUPLING-master-MPI.pyconf
@@ -13,12 +13,12 @@ APPLICATION :
     {
         build :
         {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           SALOME_USE_64BIT_IDS : '1'
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            SALOME_USE_64BIT_IDS : '1'
         }
         launch :
         {
-           PYTHONIOENCODING:"UTF_8"
+            PYTHONIOENCODING:"UTF_8"
         }
     }
     products :
@@ -86,12 +86,13 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-    __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
-  }
+    {
+        __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
+    }
+    {
+        # https://github.com/pyenv/pyenv/issues/1889
+        __condition__: "VARS.dist in ['FD34']"
+        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_FD34'}
+    }
 ]
diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index ede3e28..ad101f1 100644
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -14,14 +14,14 @@ APPLICATION :
     {
         build : 
         {
-          CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-          SALOME_HAS_GLOBAL_ENV: "1"
-          SALOME_USE_64BIT_IDS : '1'
-          CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            SALOME_HAS_GLOBAL_ENV: "1"
+            SALOME_USE_64BIT_IDS : '1'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
         }
         launch :
         {
-          PYTHONIOENCODING:"UTF_8"
+            PYTHONIOENCODING:"UTF_8"
         }
     }
     products :
@@ -81,8 +81,8 @@ APPLICATION :
         zlib : '1.2.5'
 
         # SALOME MODULES :
-        'CONFIGURATION': {dev: 'yes'}
-        'MEDCOUPLING': {dev: 'yes'}
+        'CONFIGURATION'
+        'MEDCOUPLING'
     }
     test_base :
     {
-- 
2.39.2