From 27536027c8c52cb0f8e5e5959b4390b1eff81837 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 22 Aug 2024 10:39:57 +0200 Subject: [PATCH] Align MEDCOUPLING application files with SALOME 9.13 ones --- applications/MEDCOUPLING-9.13.0-MPI.pyconf | 41 --------------- applications/MEDCOUPLING-9.13.0-int32.pyconf | 52 ++++---------------- applications/MEDCOUPLING-9.13.0.pyconf | 3 +- applications/SALOME-9.13.0-MPI.pyconf | 13 ++++- applications/SALOME-9.13.0-int32.pyconf | 12 +++-- 5 files changed, 30 insertions(+), 91 deletions(-) diff --git a/applications/MEDCOUPLING-9.13.0-MPI.pyconf b/applications/MEDCOUPLING-9.13.0-MPI.pyconf index 9cf2b37..c9bd00d 100644 --- a/applications/MEDCOUPLING-9.13.0-MPI.pyconf +++ b/applications/MEDCOUPLING-9.13.0-MPI.pyconf @@ -101,44 +101,6 @@ APPLICATION : __overwrite__ : [ { - __condition__ : "APPLICATION.pyver == '3.6'" - 'APPLICATION.rm_products' : [ - "charset_normalizer", - "importlib_metadata", - "sphinxcontrib_applehelp", - "sphinxcontrib_devhelp", - "sphinxcontrib_jsmath", - "sphinxcontrib_qthelp", - "sphinxcontrib_htmlhelp", - "sphinxcontrib_serializinghtml", - "sphinxcontrib_napoleon", - "zipp" - ] - 'APPLICATION.products.Babel' : '2.7.0' - 'APPLICATION.products.cmake' : '3.25.2' - 'APPLICATION.products.Cython' : '0.29.12' - 'APPLICATION.products.docutils' : '0.12' - 'APPLICATION.products.imagesize' : '1.0.0' - 'APPLICATION.products.Jinja2' : '2.7.3' - 'APPLICATION.products.libxml2' : '2.9.1' - 'APPLICATION.products.markupsafe' : '0.23' - 'APPLICATION.products.mpi4py' : '3.0.3' - 'APPLICATION.products.numpy' : '1.16.4' - 'APPLICATION.products.packaging' : '17.1' - 'APPLICATION.products.Pygments' : '2.0.2' - 'APPLICATION.products.pyparsing' : '2.0.3' - 'APPLICATION.products.Python' : '3.6.5' - 'APPLICATION.products.requests' : '2.19.1' - 'APPLICATION.products.scipy' : '1.4.1' - 'APPLICATION.products.scotch' : '6.0.4' - 'APPLICATION.products.setuptools' : '38.4.0' - 'APPLICATION.products.snowballstemmer' : '1.2.1' - 'APPLICATION.products.Sphinx' : '1.7.6' - 'APPLICATION.products.sphinx_rtd_theme' : '0.4.3' - 'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0' - 'APPLICATION.products.sphinxintl' : '0.9.10' - } - { __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 @@ -149,8 +111,6 @@ __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' - # 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']" @@ -163,6 +123,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-9.13.0-int32.pyconf b/applications/MEDCOUPLING-9.13.0-int32.pyconf index d2a8c58..22f06eb 100644 --- a/applications/MEDCOUPLING-9.13.0-int32.pyconf +++ b/applications/MEDCOUPLING-9.13.0-int32.pyconf @@ -9,11 +9,16 @@ APPLICATION : base : 'no' debug : 'no' python3 : 'yes' - pyver : '3.9' environ : { - build : {CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"} - launch : {PYTHONIOENCODING:"UTF_8"} + build : + { + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + } + launch : + { + PYTHONIOENCODING:"UTF_8" + } } products : { @@ -47,7 +52,7 @@ APPLICATION : Pygments : '2.17.2' pyparsing : '3.1.1' Python : '3.9.14' - pytz : '2015.7' + pytz : '2017.2' requests : '2.31.0' scipy : '1.6.2' scotch : '6.1.2' @@ -63,6 +68,7 @@ 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' @@ -87,44 +93,6 @@ APPLICATION : } __overwrite__ : [ - { - __condition__ : "APPLICATION.pyver == '3.6'" - 'APPLICATION.rm_products' : [ - "charset_normalizer", - "importlib_metadata", - "sphinxcontrib_applehelp", - "sphinxcontrib_devhelp", - "sphinxcontrib_jsmath", - "sphinxcontrib_qthelp", - "sphinxcontrib_htmlhelp", - "sphinxcontrib_serializinghtml", - "sphinxcontrib_napoleon", - "zipp" - ] - 'APPLICATION.products.Babel' : '2.7.0' - 'APPLICATION.products.cmake' : '3.25.2' - 'APPLICATION.products.Cython' : '0.29.12' - 'APPLICATION.products.docutils' : '0.12' - 'APPLICATION.products.imagesize' : '1.0.0' - 'APPLICATION.products.Jinja2' : '2.7.3' - 'APPLICATION.products.libxml2' : '2.9.1' - 'APPLICATION.products.markupsafe' : '0.23' - 'APPLICATION.products.mpi4py' : '3.0.3' - 'APPLICATION.products.numpy' : '1.16.4' - 'APPLICATION.products.packaging' : '17.1' - 'APPLICATION.products.Pygments' : '2.0.2' - 'APPLICATION.products.pyparsing' : '2.0.3' - 'APPLICATION.products.Python' : '3.6.5' - 'APPLICATION.products.requests' : '2.19.1' - 'APPLICATION.products.scipy' : '1.4.1' - 'APPLICATION.products.scotch' : '6.0.4' - 'APPLICATION.products.setuptools' : '38.4.0' - 'APPLICATION.products.snowballstemmer' : '1.2.1' - 'APPLICATION.products.Sphinx' : '1.7.6' - 'APPLICATION.products.sphinx_rtd_theme' : '0.4.3' - 'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0' - 'APPLICATION.products.sphinxintl' : '0.9.10' - } { __condition__ : "VARS.dist in ['FD32']" '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 diff --git a/applications/MEDCOUPLING-9.13.0.pyconf b/applications/MEDCOUPLING-9.13.0.pyconf index 5c0139b..84573a4 100644 --- a/applications/MEDCOUPLING-9.13.0.pyconf +++ b/applications/MEDCOUPLING-9.13.0.pyconf @@ -53,7 +53,7 @@ APPLICATION : Pygments : '2.17.2' pyparsing : '3.1.1' Python : '3.9.14' - pytz : '2015.7' + pytz : '2017.2' requests : '2.31.0' scipy : '1.6.2' scotch : '6.1.2' @@ -69,6 +69,7 @@ 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' diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf index c8dd5c0..c44b046 100644 --- a/applications/SALOME-9.13.0-MPI.pyconf +++ b/applications/SALOME-9.13.0-MPI.pyconf @@ -42,6 +42,7 @@ APPLICATION : catalyst: '2.0' C3PO: 'v2.3' certifi : '2018.8.24' + cftime: '1.6.3' cgns : {tag : '4.2.0', hpc : 'yes'} chardet : '3.0.4' charset_normalizer : '3.3.2' @@ -64,10 +65,13 @@ APPLICATION : gcc : '8.5.0' mpc : 'native' gmp : 'native' + mmg : '5.6.0' + mmgplugin: 'main' mpfr : 'native' gdal : {tag : '2.4.0', hpc : 'yes'} gmsh : {tag : '4.10.3', section : 'version_4_10_3_with_CAS_7_8_MPI', hpc : 'yes', base : 'no'} graphviz : '2.38.0' + h5py : '3.11.0' hdf5 : {tag : '1.10.3', hpc : 'yes'} idna : '2.7' imagesize : '1.4.1' @@ -80,14 +84,18 @@ APPLICATION : libxml2 : '2.9.12' llvm : '8.0.1-clang' markupsafe : '2.1.5' + markdown_it_py: '3.0.0' matplotlib : '3.8.2' + mdurl: '0.1.2' medfile : {tag : '4.1.1', hpc : 'yes'} mesa : '19.0.8' MeshGems : {tag : '2.15-1', hpc : 'yes'} + meshio : {tag: '5.3.5' , base: 'no', section : 'version_5_3_5_no_pip'} mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} ParMetis : '4.0.3-p6' netgen : '5.3.1_with_CAS_7.8' netcdf : {tag : '4.6.2', hpc : 'yes'} + netCDF4 : '1.6.5' nlopt : '2.5.0' nose: '1.3.7' numpy : '1.21.1' @@ -116,9 +124,10 @@ APPLICATION : pyreadline : '2.0' Python : '3.9.14' pytz : '2017.2' - qt : '5.12.10' - qwt : '6.1.2' + qt : '5.15.2' + qwt : '6.1.6' requests : '2.31.0' + rich : '13.7.1' rkCommon : '1.5.1' root: '6.22.02' salome_system : 'native' diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf index a7a9068..03d9e8b 100644 --- a/applications/SALOME-9.13.0-int32.pyconf +++ b/applications/SALOME-9.13.0-int32.pyconf @@ -64,6 +64,8 @@ APPLICATION : gcc : '8.5.0' mpc : 'native' gmp : 'native' + mmg : '5.6.0' + mmgplugin: 'main' mpfr : 'native' gdal : '2.4.0' gmsh : '4.10.3_with_CAS_7.8' @@ -87,9 +89,9 @@ APPLICATION : medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.15-1' - meshio : '5.3.5' - mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} - metis : '5.1.0' + meshio : {tag: '5.3.5' , base: 'no', section : 'version_5_3_5_no_pip'} + mpi4py : {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} + metis : '5.1.0' netgen : '5.3.1_with_CAS_7.8' netcdf : '4.6.2' netCDF4 : '1.6.5' @@ -121,8 +123,8 @@ APPLICATION : pyreadline : '2.0' Python : '3.9.14' pytz : '2017.2' - qt : '5.12.10' - qwt : '6.1.2' + qt : '5.15.2' + qwt : '6.1.6' requests : '2.31.0' rich : '13.7.1' rkCommon : '1.5.1' -- 2.39.2