Fix dependencies; add switch py39 to py36; add option to compile openturns 1.21 with...

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 141b938de3bd08c20ea1d7ab3987514e4da63e0a..f3b60ffacfbf023f2b9b744c891e32501e96006e 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -3,16 +3,17 @@
 
 APPLICATION :
 {
-    name : 'SALOME-master'
-    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'master'
-    dev : 'no'
-    verbose :'no'
-    debug : 'no'
-    base : 'no'
-    python3 : 'yes'
+    name     : 'SALOME-master'
+    workdir  : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag      : 'master'
+    dev      : 'no'
+    verbose  : 'no'
+    debug    : 'no'
+    base     : 'no'
+    python3  : 'yes'
+    pyver    : '3.6'
     platform : ['CO7', 'CO8', 'DB09']
-    environ :
+    environ  :
     {
         build : 
         {
@@ -224,6 +225,157 @@ 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.21',  base: 'no', section: 'version_1_21_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'
+        ]
+        '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.21',  base: 'no', section: 'version_1_21_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'
+        ]
+        '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.21',  base: 'no', section: 'version_1_21_DB09' }
+        'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -236,12 +388,12 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['CO7']"
+        __condition__ : "VARS.dist in ['CO7'] and APPLICATION.pyver != '3.6'"
         'APPLICATION.rm_products'         : ['gcc', 'gmp', 'mpc', 'mpfr']
         'APPLICATION.products.openturns'  : {tag: '1.21',  base: 'no', section: 'version_1_21_CO7' }
     }
     {
-        __condition__ : "VARS.dist in ['CO8']"
+        __condition__ : "VARS.dist in ['CO8'] and APPLICATION.pyver != '3.6'"
         '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.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'}
@@ -253,7 +405,7 @@ __overwrite__ :
         'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
     {
-        __condition__ : "VARS.dist in ['DB09']"
+        __condition__ : "VARS.dist in ['DB09'] and APPLICATION.pyver != '3.6'"
         'APPLICATION.products.openturns'        : {tag: '1.21',  base: 'no', section: 'version_1_21_DB09' }
         'APPLICATION.products.MEDCOUPLING'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
     }

diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf
index d91c70ea87df9298adfa03c695d44e7b1c004bcf..d428b6d3f621bab721d3ccbafe140f3b16c08cb2 100644 (file)
--- a/products/Sphinx.pyconf
+++ b/products/Sphinx.pyconf
@@ -16,7 +16,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ["Python", "setuptools", "six", "Pygments", "Jinja2", "docutils", "sphinxcontrib_websupport", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer"]
+    depend : ["Python", "setuptools", "six", "Pygments", "Jinja2", "docutils", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer"]
     opt_depend : ["importlib_metadata", "sphinxcontrib_applehelp", "sphinxcontrib_devhelp", 
                   "sphinxcontrib_htmlhelp", "sphinxcontrib_jsmath", "sphinxcontrib_qthelp",
                   "sphinxcontrib_serializinghtml"
@@ -49,6 +49,11 @@ version_2_1_2:
    depend : ["Python", "setuptools", "Pygments", "Jinja2", "docutils", "sphinxcontrib_applehelp", "sphinxcontrib_serializinghtml","sphinxcontrib_websupport", "sphinxcontrib_htmlhelp", "sphinxcontrib_qthelp", "sphinxcontrib_devhelp", "sphinxcontrib_jsmath", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer", "markupsafe", "colorama"]
 }
 
+version_1_7_6:
+{
+    depend : ["Python", "setuptools", "six", "Pygments", "Jinja2", "docutils", "sphinxcontrib_websupport", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer"]
+    opt_depend : []
+}
 
 version_1_7_6_no_pip:
 {

diff --git a/products/compil_scripts/openturns-1.21.sh b/products/compil_scripts/openturns-1.21.sh
index dbbd14ced1272e69a2c0aa10ed4ba5987571291f..126f73c65fa0fe2d2e835be59195340788b7d13d 100755 (executable)
--- a/products/compil_scripts/openturns-1.21.sh
+++ b/products/compil_scripts/openturns-1.21.sh
@@ -378,13 +378,25 @@ if [[ -d "$SOURCE_DIR/otfftw-0.13" ]]; then
                     echo "FATAL: could not install decorator-5.1.0"
                     exit 6
                 fi
-                echo "INFO: install scikit-learn-0.24.2"
-                ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps
-                if [ $? -ne 0 ]
+                if [ "${PYTHON_VERSION}" == "3.6" ]
                 then
-                    echo "FATAL: could not install scikit-0.24.2"
-                    exit 6
+                    echo "INFO: install scikit-learn-0.24.2"
+                    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps
+                    if [ $? -ne 0 ]
+                    then
+                        echo "FATAL: could not install scikit-0.24.2"
+                        exit 6
+                    fi
+                else
+                    echo "INFO: install scikit-learn-1.2.2"
+                    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit-learn-1.2.2.tar.gz --no-deps
+                    if [ $? -ne 0 ]
+                    then
+                        echo "FATAL: could not install scikit-1.2.2"
+                        exit 6
+                    fi
                 fi
+
             fi
         fi
 

diff --git a/products/matplotlib.pyconf b/products/matplotlib.pyconf
index c40562032503f6aeda70f904bc4224e6ed23c2ec..ca6603446778b3ee2539f4a14cbfa368b747ed3a 100755 (executable)
--- a/products/matplotlib.pyconf
+++ b/products/matplotlib.pyconf
@@ -45,7 +45,7 @@ default_win :
 
 version_3_3_4 :
 {
-    compil_script : "matplotlib-3.3.4.sh"
+    opt_depend : ['kiwisolver', 'packaging', 'Pillow']
     properties:
     {
       incremental : "yes"

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index 6f0820c4f12da521dbfece51aff6494bc84bf3dc..5bd80e95804c42fc6adf41f7b5589ae99a070bef 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -10,7 +10,7 @@ default :
     }
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib']
     build_depend : ["cmake", "swig"]
-    opt_depend : ['openmpi']
+    opt_depend : ['openmpi','psutil','numpy','scipy','statsmodels']
     patches : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name

diff --git a/products/sphinxcontrib_websupport.pyconf b/products/sphinxcontrib_websupport.pyconf
index 0e0cc8ca6900302e435aaa10509d00d826f53cf9..f9d3c62a552a16e87b34c2463c16de8003ad670b 100755 (executable)
--- a/products/sphinxcontrib_websupport.pyconf
+++ b/products/sphinxcontrib_websupport.pyconf
@@ -15,7 +15,8 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python','setuptools']
+    depend : ['Python','setuptools','Jinja2','Sphinx']
+    opt_dep : ['sphinxcontrib_serializinghtml']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
@@ -32,3 +33,10 @@ default_win :
    compil_script :  'pip_install_whl' + $VARS.scriptExtension
    archive_info : {archive_name : "sphinxcontrib_websupport-" + $APPLICATION.products.sphinxcontrib_websupport + "_windows.tar.gz"}
 }
+
+version_1_1_0:
+{
+    depend : ['Python','setuptools']
+    opt_dep : []
+}
+