From e285141b7112e44fb975803e231f1f72338918dd Mon Sep 17 00:00:00 2001
From: Guytri KASTANE <guytri.kastane@csgroup.eu>
Date: Wed, 27 Mar 2024 11:24:53 +0100
Subject: [PATCH] spns #30166: fixes aimed to support UB18.04 for universal
 binary

---
 applications/SALOME-master.pyconf | 1 +
 products/env_scripts/mpi4py.py    | 1 +
 products/pandas.pyconf            | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index f417305..1d3bc85 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -246,6 +246,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['UB18.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.pandas' : '0.25.3'
     }
     {
         __condition__ : "VARS.dist in ['UB20.04']"
diff --git a/products/env_scripts/mpi4py.py b/products/env_scripts/mpi4py.py
index 97003e7..296a697 100644
--- a/products/env_scripts/mpi4py.py
+++ b/products/env_scripts/mpi4py.py
@@ -9,6 +9,7 @@ def set_env(env, prereq_dir, version):
   else :
     versionPython = env.get('PYTHON_VERSION')
     env.set("MPI4PY_ROOT_DIR",os.path.join(prereq_dir, 'lib', 'python' + versionPython, 'site-packages'))
+    env.prepend("PYTHONPATH",os.path.join(prereq_dir, 'lib', 'python' + versionPython, 'site-packages'))
 
 def set_nativ_env(env):
     pass
diff --git a/products/pandas.pyconf b/products/pandas.pyconf
index 2b4c212..5c6a225 100644
--- a/products/pandas.pyconf
+++ b/products/pandas.pyconf
@@ -15,7 +15,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'setuptools', 'Cython', 'dateutil']
+    depend : ['Python', 'setuptools', 'Cython', 'dateutil', 'numpy']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
-- 
2.39.2