spns #41276: MEDCOUPLING: fix configuration files

diff --git a/applications/MEDCOUPLING-9.11.0-windows.pyconf b/applications/MEDCOUPLING-9.11.0-windows.pyconf
index b54c13546aa9508c52044de13df4a6d17b2f4016..9b0997b7b952ee3a5d0bac1e228aad543c6513e0 100644 (file)
--- a/applications/MEDCOUPLING-9.11.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.11.0-windows.pyconf
@@ -55,6 +55,7 @@ APPLICATION :
         msvc : '2017'
         numpy : '1.16.4'
         packaging : '19.0'
+        perl : '5.28.1.1'
         pockets : '0.7.2'
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
@@ -91,7 +92,7 @@ APPLICATION :
     }
     properties :
     {
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "yes"

diff --git a/applications/MEDCOUPLING-9.12.0-windows.pyconf b/applications/MEDCOUPLING-9.12.0-windows.pyconf
index d1582e9b4657bc500b485e67f37c42662105fa28..54ec32dbfbac8fa24cb28da73e6a9f662176c7ae 100644 (file)
--- a/applications/MEDCOUPLING-9.12.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.12.0-windows.pyconf
@@ -55,6 +55,7 @@ APPLICATION :
         msvc : '2017'
         numpy : '1.16.4'
         packaging : '19.0'
+        perl : '5.28.1.1'
         pockets : '0.7.2'
         Pygments : '2.4.2'
         pyparsing : '2.4.0'
@@ -91,7 +92,7 @@ APPLICATION :
     }
     properties :
     {
-        repo_dev : "yes"
+        git_server : 'tuleap'
         pip : 'yes'
         pip_install_dir : 'python'
         single_install_dir : "yes"

diff --git a/applications/MEDCOUPLING-9.13.0-MPI.pyconf b/applications/MEDCOUPLING-9.13.0-MPI.pyconf
index c1cea00a95702b4c4f4599217264024d9ea167a9..a8ce6fc8f7951369ed82d5afb358fa0197f29524 100644 (file)
--- a/applications/MEDCOUPLING-9.13.0-MPI.pyconf
+++ b/applications/MEDCOUPLING-9.13.0-MPI.pyconf
@@ -9,7 +9,6 @@ APPLICATION :
     base     : 'no'
     debug    : 'no'
     python3  : 'yes'
-    pyver    : '3.9'
     platform : ['CO7', 'CO8', 'DB09']
     environ  :
     {
@@ -106,7 +105,7 @@ __overwrite__ :
         'APPLICATION.products.scipy' : '1.5.2'
     }
     {
-        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37']"
+        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37', 'FD38']"
         # 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-9.13.0-native.pyconf b/applications/MEDCOUPLING-9.13.0-native.pyconf
index 82685a3e791b00f3d38b80e2f551442fe6b3873d..71474882e07a1388a0525b09ec74771cfa034fae 100644 (file)
--- a/applications/MEDCOUPLING-9.13.0-native.pyconf
+++ b/applications/MEDCOUPLING-9.13.0-native.pyconf
@@ -94,6 +94,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['CO9']"
         'APPLICATION.products.sphinxintl'       : {tag: '0.9.10',  base: 'no', section: 'version_0_9_10_no_pip' }
+        'APPLICATION.products.openmpi'          : '4.1.5'
     }
     {
         __condition__ : "VARS.dist in ['UB22.04']"

diff --git a/applications/MEDCOUPLING-9.13.0-windows.pyconf b/applications/MEDCOUPLING-9.13.0-windows.pyconf
index f53230e7c8c5c4168d66799a6612beaba9660e09..d7700c21583b56e9b3e6704e32d041d8797b13a8 100644 (file)
--- a/applications/MEDCOUPLING-9.13.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.13.0-windows.pyconf
@@ -58,6 +58,7 @@ APPLICATION :
         numpy : '1.21.6'
         openblas : '0.3.23'
         packaging : '19.0'
+        perl : '5.28.1.1'
         pockets : '0.7.2'
         Pygments : '2.13.0'
         pyparsing : '2.4.0'

diff --git a/applications/MEDCOUPLING-master-MPI.pyconf b/applications/MEDCOUPLING-master-MPI.pyconf
index d1b138ac3e04c3bb04c098ff98f520c93f2ddeb8..b335655130a5d67141d192a65e528fce046d5372 100644 (file)
--- a/applications/MEDCOUPLING-master-MPI.pyconf
+++ b/applications/MEDCOUPLING-master-MPI.pyconf
@@ -74,7 +74,6 @@ APPLICATION :
         sphinxcontrib_serializinghtml : '1.1.10'
         sphinxcontrib_napoleon : '0.6.1'
         sphinxcontrib_websupport : '1.2.7'
-        sphinx_rtd_theme         : '2.0.0'
         sphinxintl: '2.1.0'
         swig : '4.0.2'
         urllib3 : '1.23'
@@ -99,19 +98,17 @@ 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']"
+        __condition__: "VARS.dist in ['FD34', 'FD36', 'FD37', 'FD38']"
         # 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']"
@@ -124,6 +121,5 @@ __overwrite__ :
         # 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'
-        'APPLICATION.products.Python' : {tag: '3.6.5', base: 'no', section: 'version_3_6_5_UB22_04'}
     }
 ]

diff --git a/applications/MEDCOUPLING-master-native.pyconf b/applications/MEDCOUPLING-master-native.pyconf
index b66804dd1dff50f0754f0f8c7decfefbabe68cdd..ac246e15bce252932a9596eb61c492da94374301 100644 (file)
--- a/applications/MEDCOUPLING-master-native.pyconf
+++ b/applications/MEDCOUPLING-master-native.pyconf
@@ -94,6 +94,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['CO9']"
         'APPLICATION.products.sphinxintl'       : {tag: '0.9.10',  base: 'no', section: 'version_0_9_10_no_pip' }
+        'APPLICATION.products.openmpi'          : '4.1.5'
     }
     {
         __condition__ : "VARS.dist in ['UB22.04']"

diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index 66ccb81d220a6551b6673078a51e6f3417c74816..b426cb10f61f4db80137c656765b57b9b9644f15 100644 (file)
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -58,6 +58,7 @@ APPLICATION :
         numpy : '1.21.6'
         openblas : '0.3.23'
         packaging : '19.0'
+        perl : '5.28.1.1'
         pockets : '0.7.2'
         Pygments : '2.13.0'
         pyparsing : '2.4.0'