From 764a4b57677992d2af9bf534b520a2e82221fc4b Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 7 Apr 2023 10:07:47 +0200 Subject: [PATCH] spns #34285 : rename and fix the two openturns patches --- products/openturns.pyconf | 20 +++++++++---------- ...0001.patch => openturns-1.20.1.0001.patch} | 6 +++--- ...0002.patch => openturns-1.20.1.0002.patch} | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) rename products/patches/{openturns-1.20.0001.patch => openturns-1.20.1.0001.patch} (54%) rename products/patches/{openturns-1.20.0002.patch => openturns-1.20.1.0002.patch} (70%) diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 906e854..e0121a7 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -37,7 +37,7 @@ default_win : version_1_20_1 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension + compil_script : "openturns-1.20.1" + $VARS.scriptExtension patches : [] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] @@ -45,8 +45,8 @@ version_1_20_1 : version_1_20_1_UB22_04 : { - compil_script : "openturns-1.20" + $VARS.scriptExtension - patches : ['openturns-1.20.0002.patch'] + compil_script : "openturns-1.20.1" + $VARS.scriptExtension + patches : ['openturns-1.20.1.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -54,7 +54,7 @@ version_1_20_1_UB22_04 : version_1_20_1_UB20_04 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0002.patch'] + patches : ['openturns-1.20.1.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -62,7 +62,7 @@ version_1_20_1_UB20_04 : version_1_20_1_DB11 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0002.patch'] + patches : ['openturns-1.20.1.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -70,7 +70,7 @@ version_1_20_1_DB11 : version_1_20_1_DB09 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0001.patch'] + patches : ['openturns-1.20.1.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -78,7 +78,7 @@ version_1_20_1_DB09 : version_1_20_1_CO8 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0001.patch'] + patches : ['openturns-1.20.1.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -86,7 +86,7 @@ version_1_20_1_CO8 : version_1_20_1_CO7 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0001.patch'] + patches : ['openturns-1.20.1.0001.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -110,7 +110,7 @@ version_1_20_1_FD36 : version_1_20_1_FD34 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0002.patch'] + patches : ['openturns-1.20.1.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } @@ -118,7 +118,7 @@ version_1_20_1_FD34 : version_1_20_1_FD32 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension - patches : ['openturns-1.20.0002.patch', 'openturns-1.20.0003.patch'] + patches : ['openturns-1.20.1.0002.patch'] depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] opt_depend : ['pandas', 'statsmodels'] } diff --git a/products/patches/openturns-1.20.0001.patch b/products/patches/openturns-1.20.1.0001.patch similarity index 54% rename from products/patches/openturns-1.20.0001.patch rename to products/patches/openturns-1.20.1.0001.patch index e30a66f..7c1372a 100644 --- a/products/patches/openturns-1.20.0001.patch +++ b/products/patches/openturns-1.20.1.0001.patch @@ -1,6 +1,6 @@ -diff -Naur openturns-1.20_ref/openturns-1.20/CMakeLists.txt openturns-1.20_dev/openturns-1.20/CMakeLists.txt ---- openturns-1.20_ref/openturns-1.20/CMakeLists.txt 2023-03-31 13:11:11.000000000 +0200 -+++ openturns-1.20_dev/openturns-1.20/CMakeLists.txt 2023-04-04 10:35:09.815050125 +0200 +diff -Naur openturns-1.20.1_ref/openturns-1.20.1/CMakeLists.txt openturns-1.20.1_dev/openturns-1.20.1/CMakeLists.txt +--- openturns-1.20.1_ref/openturns-1.20.1/CMakeLists.txt 2023-03-31 13:11:11.000000000 +0200 ++++ openturns-1.20.1_dev/openturns-1.20.1/CMakeLists.txt 2023-04-04 10:35:09.815050125 +0200 @@ -154,6 +154,10 @@ endif () endif () diff --git a/products/patches/openturns-1.20.0002.patch b/products/patches/openturns-1.20.1.0002.patch similarity index 70% rename from products/patches/openturns-1.20.0002.patch rename to products/patches/openturns-1.20.1.0002.patch index 64965eb..d832e70 100644 --- a/products/patches/openturns-1.20.0002.patch +++ b/products/patches/openturns-1.20.1.0002.patch @@ -1,5 +1,5 @@ ---- openturns_ref/openturns-1.20/CMakeLists.txt 2023-03-31 13:11:11.000000000 +0200 -+++ openturns_dev/openturns-1.20/CMakeLists.txt 2023-04-05 11:34:07.224075227 +0200 +--- openturns_ref/openturns-1.20.1/CMakeLists.txt 2023-03-31 13:11:11.000000000 +0200 ++++ openturns_dev/openturns-1.20.1/CMakeLists.txt 2023-04-05 11:34:07.224075227 +0200 @@ -315,7 +315,11 @@ endif () -- 2.39.2