UB20, FC32, DB10: native OK!

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index a8e07627234f4137f7c3dc018abb13650bd413f2..7412dfec0dc98df3488a0177e98cb737adf30d5b 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -81,6 +81,7 @@ APPLICATION :
         openturns: '1.17'
         ospray : '2.4.0'
         packaging : 'native'
+        #        pandas : '1.13.1'
         ParaView : '5.9.0'
         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : 'native'
@@ -110,6 +111,7 @@ APPLICATION :
         sphinxintl: 'native'
         sphinx_rtd_theme : 'native'
         StaticMeshPlugin: '5.8.0'
+        statsmodels : 'native'
         swig : 'native'
         salome_system : 'native'
         tbb : 'native'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 210c3c7f8ee7d13d32b4daec6db55e3a7462bd57..a27f6d46b46b7c7fdb5c03694af508ff52e0a83d 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -41,7 +41,7 @@ APPLICATION :
         cppunit : '1.13.2'
         cycler : '0.10.0'
         Cython : '0.25.2'
-        dateutil : '2.4.2'
+        dateutil : '2.6.1'
         docutils : '0.12'
         doxygen : '1.8.14'
         eigen : '3.3.4'
@@ -76,6 +76,8 @@ APPLICATION :
         openVKL: '0.11.0'
         ospray : '2.4.0'
         packaging : '17.1'
+        pandas : '0.25.2'
+        patsy : '0.5.2'
         ParaView : '5.9.0'
         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : '7.1.1'
@@ -88,7 +90,7 @@ APPLICATION :
         #PyQtChart : '5.9'
         pyreadline : '2.0'
         Python : '3.6.5'
-        pytz : '2015.7'
+        pytz : '2017.2'
         qt : '5.12.10'
         qwt : '6.1.2'
         requests : '2.19.1'
@@ -106,6 +108,7 @@ APPLICATION :
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
         StaticMeshPlugin: '5.8.0'
+        statsmodels: '0.8.0'
         swig : '3.0.12'
         tbb : '2019_U8'
         tcl : '8.6.0'

diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh
index dfedd7137986804d5a474a0d4b0c06405b2f2388..53d834686531ceeb147779f556d0e70b8f3426b9 100755 (executable)
--- a/products/compil_scripts/openturns-1.17.sh
+++ b/products/compil_scripts/openturns-1.17.sh
@@ -192,7 +192,7 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then
     done
     declare -A OTP
     OTP["otfmi"]="0.11"
-    #OTP["otpod"]="0.6.7"
+    OTP["otpod"]="0.6.7"
     OTP["otwrapy"]="0.10"
     for k in ${!OTP[@]};
     do 

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index 61d9e345a286d109051cc99cdff9dd5fbda95961..bfedf955fbbb8abf0ee659300debaa12ff094188 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -51,6 +51,7 @@ version_1_17 :
     compil_script :  "openturns-1.17" + $VARS.scriptExtension
     patches : ['openturns-1.17.0001.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
+    opt_depends : ['pandas', 'statsmodels']
 }
 
 version_1_17_win :

diff --git a/products/patsy.pyconf b/products/patsy.pyconf
new file mode 100644 (file)
index 0000000..107fad8
--- /dev/null
+++ b/products/patsy.pyconf
@@ -0,0 +1,28 @@
+default :
+{
+    name : "patsy"
+    build_source : "script"
+    compil_script : "pip_install" + $VARS.scriptExtension
+    get_source : "archive"
+    system_info : 
+    {
+        rpm : []
+        rpm_dev : []
+        apt : []
+        apt_dev : []
+    }
+    environ :
+    {
+
+    }
+    depend : ["Python", "setuptools"]
+    opt_depend : ['pandas']
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+    properties:
+    {
+      incremental : "yes"
+      pip : "yes"
+    }
+}

diff --git a/products/statsmodels.pyconf b/products/statsmodels.pyconf
new file mode 100644 (file)
index 0000000..9c8cc69
--- /dev/null
+++ b/products/statsmodels.pyconf
@@ -0,0 +1,28 @@
+default :
+{
+    name : "statsmodels"
+    build_source : "script"
+    compil_script : "pip_install" + $VARS.scriptExtension
+    get_source : "archive"
+    system_info : 
+    {
+        rpm : ['python3-statsmodels']
+        rpm_dev : ['python3-statsmodels']
+        apt : ['python3-statsmodels']
+        apt_dev : ['python3-statsmodels']
+    }
+    environ :
+    {
+
+    }
+    depend : ["Python", "setuptools","PyFMI"]
+    opt_depend : ['pandas', 'patsy']
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+    properties:
+    {
+      incremental : "yes"
+      pip : "yes"
+    }
+}