spns #30166: fixes aimed to support UB18.04 for universal binary

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index f4173050b599303210937fcb17a3ee5813c05198..1d3bc85fc8698575f628d7d445cbbbe5242ec340 100644 (file)
--- 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 97003e7a8f9e8bf55b1332f1898f90c78fe14f5c..296a6978295e1665d1e9c050290ca4d65810ba27 100644 (file)
--- 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 2b4c2124fc3b8e4900df98f3b2da09ca7187a57e..5c6a225595741102da66d5191ebf6442824d2483 100644 (file)
--- 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'