remove Python 3.6 build switch for SALOME-9.13.0, since we moved to python 3.9

diff --git a/applications/MEDCOUPLING-9.13.0.pyconf b/applications/MEDCOUPLING-9.13.0.pyconf
index 079a23fa0422ddab0e4a2e49bd7d3942f79fae86..5c0139bf6f49d53e1e2bef1df83c678d8113f6cd 100644 (file)
--- a/applications/MEDCOUPLING-9.13.0.pyconf
+++ b/applications/MEDCOUPLING-9.13.0.pyconf
@@ -5,11 +5,10 @@ APPLICATION :
 {
     name    : 'MEDCOUPLING-9.13.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag     : 'V9_13_0b1'
+    tag     : 'V9_13_BR'
     base    : 'no'
     debug   : 'no'
     python3 : 'yes'
-    pyver   : '3.9'
     environ :
     {
         build :
@@ -94,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/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf
index d620e86547c0f502e1567cb56bbc9d2d7d726a4d..9008d1040375ceda65609621d79336433add0bb2 100644 (file)
--- a/applications/SALOME-9.13.0-MPI.pyconf
+++ b/applications/SALOME-9.13.0-MPI.pyconf
@@ -11,7 +11,6 @@ APPLICATION :
     debug    : 'no'
     base     : 'no'
     python3  : 'yes'
-    pyver    : '3.9'
     platform : ['CO7']
     environ  :
     {
@@ -222,162 +221,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'tabulate',
-            'tomli',
-            'zipp',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.openturns' : {tag: '1.22',  base: 'no', section: 'version_1_22_CO7', hpc: 'yes' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr','zeromq',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8', hpc: 'yes' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.openturns'        : {tag: '1.22',  base: 'no', section: 'version_1_22_DB09', hpc: 'yes' }
-    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -390,12 +233,12 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO7', hpc: 'yes' }
     }
     {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO8']"
         'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8', hpc: 'yes' }
@@ -407,7 +250,7 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['DB09']"
         'APPLICATION.products.openturns'        : {tag: '1.22',  base: 'no', section: 'version_1_22_DB09', hpc: 'yes' }
     }
     {

diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf
index 1a2eec3e76efeee9703fbd659ee029afb7671f94..6194eeb8146b66f5b57265bb36e82bad7f3b58fe 100644 (file)
--- a/applications/SALOME-9.13.0-int32.pyconf
+++ b/applications/SALOME-9.13.0-int32.pyconf
@@ -11,7 +11,6 @@ APPLICATION :
     debug    : 'no'
     base     : 'no'
     python3  : 'yes'
-    pyver    : '3.9'
     platform : ['CO7', 'CO8', 'DB09']
     environ  :
     {
@@ -228,162 +227,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'tabulate',
-            'tomli',
-            'zipp',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.openturns' : {tag: '1.22',  base: 'no', section: 'version_1_22_CO7' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr','zeromq',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.openturns'        : {tag: '1.22',  base: 'no', section: 'version_1_22_DB09' }
-    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -396,12 +239,12 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.openturns'           : {tag:'1.22', base:'no', section:'version_1_22_CO7'}
     }
     {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO8']"
         'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.openturns'           : {tag:'1.22', base:'no', section:'version_1_22_CO8'}

diff --git a/applications/SALOME-9.13.0-windows.pyconf b/applications/SALOME-9.13.0-windows.pyconf
index 2c43044e086d72bb12c2078271d5554f7b3f7559..f91962dbf9c30432effed003619847304d40ef9c 100644 (file)
--- a/applications/SALOME-9.13.0-windows.pyconf
+++ b/applications/SALOME-9.13.0-windows.pyconf
@@ -13,7 +13,6 @@ APPLICATION :
     debug   : 'no'
     base    : 'no'
     python3 : 'yes'
-    pyver   : '3.9'
     environ :
     {
         build : 
@@ -221,27 +220,7 @@ APPLICATION :
 __overwrite__ :
 [
   {
-    __condition__ : "APPLICATION.pyver == '3.6' and APPLICATION.debug == 'no'"
-    'APPLICATION.products.alabaster' : '0.7.6'
-    'APPLICATION.products.Cython'    : '0.29.12'
-    'APPLICATION.products.dateutil'  : '2.8.0'
-    'APPLICATION.products.kiwisolver' : '1.1.0'
-    'APPLICATION.products.matplotlib' : '3.1.0'
-    'APPLICATION.products.numpy' : '1.16.4'
-    'APPLICATION.products.pandas' : '0.25.2'
-    'APPLICATION.products.Pillow' : '7.1.1'
-    'APPLICATION.products.psutil' : '5.7.2'
-    'APPLICATION.products.pyreadline' : '2.1'
-    'APPLICATION.products.Python' : '3.6.5'
-    'APPLICATION.products.pytz' : '2019.1'
-    'APPLICATION.products.scipy' : '1.4.1'
-    'APPLICATION.products.setuptools' : '41.0.1'
-    'APPLICATION.products.snowballstemmer' : '1.9.0'
-    'APPLICATION.products.Sphinx' : '2.1.2'
-    'APPLICATION.products.statsmodels' : '0.9.0'
-  }
-  {
-    __condition__ : "APPLICATION.debug == 'yes' and APPLICATION.pyver == '3.9'"
+    __condition__ : "APPLICATION.debug == 'yes'"
     'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX', 'pandas']
     'APPLICATION.products.numpy'      : {tag: '1.21.6',  base: 'no', section : 'version_1_21_6_win_dbg'     }
     'APPLICATION.products.Cython'     : {tag: '0.29.37', base: 'no', section : 'version_0_29_37_win_dbg'    }
@@ -252,32 +231,7 @@ __overwrite__ :
     'APPLICATION.products.psutil'     : {tag: '5.9.8',   base: 'no', section : 'version_5_9_8_win_dbg'      }
     'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
     'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
-    'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
-    'APPLICATION.products.cmake'      : '3.12.1' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
-  }
-  {
-    __condition__ : "APPLICATION.debug == 'yes' and APPLICATION.pyver == '3.6'"
-    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX', 'pandas']
-    'APPLICATION.products.alabaster' : '0.7.6'
-    'APPLICATION.products.dateutil'  : '2.8.0'
-    'APPLICATION.products.kiwisolver' : '1.1.0'
-    'APPLICATION.products.pyreadline' : '2.1'
-    'APPLICATION.products.Python' : '3.6.5'
-    'APPLICATION.products.pytz' : '2019.1'
-    'APPLICATION.products.setuptools' : '41.0.1'
-    'APPLICATION.products.snowballstemmer' : '1.9.0'
-    'APPLICATION.products.Sphinx' : '2.1.2'
-    'APPLICATION.products.numpy'      : {tag: '1.16.4',  base: 'no', section : 'version_1_16_4_win_dbg'     }
-    'APPLICATION.products.Cython'     : {tag: '0.29.12', base: 'no', section : 'version_0_29_12_win_dbg'    }
-    'APPLICATION.products.sphinxintl' : {tag: '2.0.0',   base: 'no', section : 'version_2_0_0_win_dbg'      }
-    'APPLICATION.products.llvm'       : {tag: '8.0.1',   base: 'no', section : 'version_8_0_1_clang_win_dbg'}
-    'APPLICATION.products.tbb'        : {tag: '2019_U8', base: 'no', section : 'version_2019_U8_win_dbg'    }
-    'APPLICATION.products.omniORB'    : {tag: '4.2.3',   base: 'no', section : 'version_4_2_3_win_dbg'      }
-    'APPLICATION.products.psutil'     : {tag: '5.7.2',   base: 'no', section : 'version_5_7_2_win_dbg'      }
-    'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
-    'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
-    'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
-    'APPLICATION.products.swig'       : '3.0.12'
+    'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : '4.10.3_with_CAS_7.8_win_dbg'}
     'APPLICATION.products.cmake'      : '3.12.1' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
   }
 ]

diff --git a/applications/SALOME-9.13.0.pyconf b/applications/SALOME-9.13.0.pyconf
index 1a3aff68cf50aa265531e13020fdd7ab20541bba..c6bb8d5f339e9be6ca66423d6c0b58bee5f89383 100644 (file)
--- a/applications/SALOME-9.13.0.pyconf
+++ b/applications/SALOME-9.13.0.pyconf
@@ -11,7 +11,6 @@ APPLICATION :
     debug    : 'no'
     base     : 'no'
     python3  : 'yes'
-    pyver    : '3.9'
     platform : ['CO7', 'CO8', 'DB09']
     environ  :
     {
@@ -231,162 +230,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-    {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'tabulate',
-            'tomli',
-            'zipp',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.openturns' : {tag: '1.22',  base: 'no', section: 'version_1_22_CO7' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'gcc', 'gmp', 'mpc', 'mpfr','zeromq',
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
-        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
-        'APPLICATION.products.openturns'  : {tag: '1.22',  base: 'no', section: 'version_1_22_CO8' }
-    }
-
-    {
-        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver == '3.6'"
-        'APPLICATION.rm_products' : [
-            'charset_normalizer',
-            'contourpy',
-            'fonttools',
-            'importlib_metadata',
-            'importlib_resources',
-            'sphinxcontrib_applehelp',
-            'sphinxcontrib_devhelp',
-            'sphinxcontrib_jsmath',
-            'sphinxcontrib_jquery',
-            'sphinxcontrib_qthelp',
-            'sphinxcontrib_htmlhelp',
-            'sphinxcontrib_serializinghtml',
-            'tabulate',
-            'tomli',
-            'zipp'
-        ]
-        'APPLICATION.products.Babel' : '2.7.0'
-        'APPLICATION.products.Cython': '0.29.12'
-        'APPLICATION.products.dateutil' : '2.6.1'
-        'APPLICATION.products.docutils' : '0.12'
-        'APPLICATION.products.imagesize' : '1.0.0'
-        'APPLICATION.products.Jinja2' : '2.7.3'
-        'APPLICATION.products.kiwisolver' : '1.0.1'
-        'APPLICATION.products.libxml2' : '2.9.1'
-        'APPLICATION.products.markupsafe' : '0.23'
-        'APPLICATION.products.matplotlib' : '3.3.4'
-        'APPLICATION.products.mpi4py' : '3.0.3'
-        'APPLICATION.products.numpy' : '1.16.4'
-        'APPLICATION.products.numpydoc' : '0.9.0'
-        'APPLICATION.products.packaging' : '17.1'
-        'APPLICATION.products.pandas' : '0.25.2'
-        'APPLICATION.products.patsy' : '0.5.2'
-        'APPLICATION.products.psutil' : '5.7.2'
-        '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.setuptools' : '38.4.0'
-        'APPLICATION.products.snowballstemmer' : '1.2.1'
-        'APPLICATION.products.Sphinx' : '1.7.6'
-        'APPLICATION.products.sphinxcontrib_websupport' : '1.1.0'
-        'APPLICATION.products.sphinx_rtd_theme' : '0.4.3'
-        'APPLICATION.products.sphinxintl' : '0.9.10'
-        'APPLICATION.products.statsmodels' : '0.8.0'
-        'APPLICATION.products.openturns'        : {tag: '1.22',  base: 'no', section: 'version_1_22_DB09' }
-    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -399,12 +242,12 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO7']"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.openturns'           : {tag:'1.22', base:'no', section:'version_1_22_CO7'}
     }
     {
-        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver == '3.9'"
+        __condition__ : "VARS.dist in ['CO8']"
         'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
         'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'                 } # spns #29324
         'APPLICATION.products.openturns'           : {tag:'1.22', base:'no', section:'version_1_22_CO8'}

diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index 5699d9e9c0d25dbddc607005ae59cbd14d836179..7170f52429c841632e62fca138a796cedec414eb 100644 (file)
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -55,6 +55,19 @@ version_4_10_3_with_CAS_7_8_win:
   patches : ['gmsh-4.10.3-occt780-win.patch']
 }
 
+version_4_10_3_with_CAS_7_8_win_dbg:
+{
+  depend : ["CAS","lapack","hdf5","medfile", "cgns"]
+  compil_script : "gmsh-4.10.3.bat"
+  patches: ['gmsh-4.10.3-occt780-win.patch',
+            'gmsh-4.10.3-windows.patch']
+  properties :
+  {
+    incremental : "yes"
+    single_install_dir : "no"
+  }
+}
+
 version_4_10_3_with_CAS_7_8_MPI:
 {
   archive_info : {archive_name : "gmsh-4.10.3.tar.gz"}