From d921297a84659323d1cc278e7897ac666b107b61 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 6 Sep 2024 16:03:08 +0200 Subject: [PATCH] bos #42835: support DB10, DB11, DB12, UB20.04 and CO7 --- applications/SALOME-master-native.pyconf | 12 +++++++----- applications/SALOME-master.pyconf | 4 ++-- products/BasicIterativeStatistics.pyconf | 5 +++++ products/compil_scripts/poetry-1.5.1.sh | 2 +- products/compil_scripts/pytest.sh | 2 +- .../patches/basicIterativeStatistics-pyver.patch | 13 +++++++++++++ products/poetry.pyconf | 10 ++-------- products/pytest.pyconf | 2 +- products/pyyaml.pyconf | 12 +++--------- 9 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 products/patches/basicIterativeStatistics-pyver.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 8a16cdc..5b4ed72 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -120,7 +120,7 @@ APPLICATION : pyparsing : 'native' PyQt : 'native' pyreadline : 'native' - pytest : '8.1.1' + pytest : 'native' Python : 'native' pytz : 'native' qt : 'native' @@ -228,7 +228,7 @@ __overwrite__ : 'APPLICATION.products.netcdf' : '4.6.2' 'APPLICATION.products.qt' : '5.15.2' 'APPLICATION.products.qwt' : '6.1.6' - 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_UB20_04' } + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' } 'APPLICATION.products.PyQt' : '5.15.3' 'APPLICATION.products.sip' : '5.5.0' 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' } @@ -293,13 +293,13 @@ __overwrite__ : # - xmlpatterns executable __condition__ : "VARS.dist in ['DB10']" 'APPLICATION.rm_products' : ['nose_py3','assimulo'] # - 'APPLICATION.products.BasicIterativeStatistics' : 'v0.0.7' 'APPLICATION.products.nlopt' : '2.4.2' 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack' : 'native' 'APPLICATION.products.hdf5' : 'native' + 'APPLICATION.products.pytest' : '8.1.1' 'APPLICATION.products.poetry_core' : '1.6.1' - 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_DB10' } + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' } 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip' } 'APPLICATION.products.qt' : '5.15.2' 'APPLICATION.products.qwt' : '6.1.6' @@ -321,7 +321,8 @@ __overwrite__ : 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.hdf5' : 'native' 'APPLICATION.products.cminpack' : 'native' - 'APPLICATION.products.pyyaml' : {tag: '6.0', base: 'no', section: 'version_6_0_DB11' } + 'APPLICATION.products.pytest' : '8.1.1' + 'APPLICATION.products.pyyaml' : {tag: '6.0', base: 'no', section: 'version_6_0_x86_64' } 'APPLICATION.products.mdurl' : {tag: '0.1.2', base: 'no', section: 'version_0_1_2_no_pip' } 'APPLICATION.products.markdown_it_py' : {tag: '3.0.0', base : 'no', section: 'version_3_0_0_no_pip'} 'APPLICATION.products.PyFMI' : {tag:'2.6', base: 'no', section: 'version_2_6_no_pip'} @@ -346,6 +347,7 @@ __overwrite__ : 'APPLICATION.products.swig' : '4.0.2' 'APPLICATION.products.tbb' : '2021.9.0' 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_DB12' } + 'APPLICATION.products.poetry' : {tag: '1.5.1', base: 'no', section: 'version_1_5_1_x86_64' } 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_DB12', hpc: 'yes' } } { diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 3bb6294..c608332 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -250,8 +250,8 @@ __overwrite__ : __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'} - 'APPLICATION.products.pyyaml' : {tag: '6.0', base: 'no', section: 'version_6_0_CO7' } - 'APPLICATION.products.poetry' : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_CO7' } + 'APPLICATION.products.pyyaml' : {tag: '6.0', base: 'no', section: 'version_6_0_x86_64' } + 'APPLICATION.products.poetry' : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_x86_64' } } { __condition__ : "VARS.dist in ['CO8']" diff --git a/products/BasicIterativeStatistics.pyconf b/products/BasicIterativeStatistics.pyconf index 1b0475f..d930e38 100644 --- a/products/BasicIterativeStatistics.pyconf +++ b/products/BasicIterativeStatistics.pyconf @@ -26,3 +26,8 @@ default : pip : "no" } } + +version_v0_1_0: +{ + patches: ['basicIterativeStatistics-pyver.patch'] +} diff --git a/products/compil_scripts/poetry-1.5.1.sh b/products/compil_scripts/poetry-1.5.1.sh index 2028cd5..391840f 100755 --- a/products/compil_scripts/poetry-1.5.1.sh +++ b/products/compil_scripts/poetry-1.5.1.sh @@ -15,7 +15,7 @@ cd $BUILD_DIR USE_WHEELS=true case $LINUX_DISTRIBUTION in - DB10|UB20*) + DB10|UB20*|DB12) export WHEELS=('poetry-1.5.1-py3-none-any.whl') ;; *) diff --git a/products/compil_scripts/pytest.sh b/products/compil_scripts/pytest.sh index 303d1de..d852ba6 100755 --- a/products/compil_scripts/pytest.sh +++ b/products/compil_scripts/pytest.sh @@ -17,7 +17,7 @@ fi if [ "${SAT_Python_IS_NATIVE}" != "1" ] || [ -z "${PYTEST}" ]; then echo echo "*** install with $PYTHONBIN -m pip install . --cache-dir=${BUILD_DIR}/cache/pip" - ${PYTHONBIN} -m pip install . --prefix=$PRODUCT_INSTALL --cache-dir=$BUILD_DIR/cache/pip + ${PYTHONBIN} -m pip install . --prefix=$PRODUCT_INSTALL --cache-dir=$BUILD_DIR/cache/pip -vvv if [ $? -ne 0 ]; then echo "pip install pytest fails" echo 3 diff --git a/products/patches/basicIterativeStatistics-pyver.patch b/products/patches/basicIterativeStatistics-pyver.patch new file mode 100644 index 0000000..9c85a17 --- /dev/null +++ b/products/patches/basicIterativeStatistics-pyver.patch @@ -0,0 +1,13 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 7e857b7..f4f0362 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -12,7 +12,7 @@ classifiers = [ + ] + + [tool.poetry.dependencies] +-python = ">=3.8,<3.11" ++python = ">=3.7,<3.13" + pyyaml = "6.0" + numpy = "^1.19.0" + diff --git a/products/poetry.pyconf b/products/poetry.pyconf index 8592e52..ddb1327 100644 --- a/products/poetry.pyconf +++ b/products/poetry.pyconf @@ -28,19 +28,13 @@ default : } } -version_1_5_1_DB10: +version_1_5_1_x86_64: { compil_script: "poetry-1.5.1.sh" archive_info : {archive_name : "poetry-1.5.1-x86_64.tar.gz"} } -version_1_5_1_UB20_04: -{ - compil_script: "poetry-1.5.1.sh" - archive_info : {archive_name : "poetry-1.5.1-x86_64.tar.gz"} -} - -version_1_8_3_CO7: +version_1_8_3_x86_64: { compil_script: "poetry-1.8.3.sh" archive_info : {archive_name : "poetry-1.8.3-x86_64.tar.gz"} diff --git a/products/pytest.pyconf b/products/pytest.pyconf index 0759126..4fdfb9b 100644 --- a/products/pytest.pyconf +++ b/products/pytest.pyconf @@ -10,7 +10,7 @@ default : { rpm : [] rpm_dev : [] - apt : ['pytho3-pytest'] + apt : ['python3-pytest'] apt_dev : [] } environ : diff --git a/products/pyyaml.pyconf b/products/pyyaml.pyconf index 1582205..1417723 100644 --- a/products/pyyaml.pyconf +++ b/products/pyyaml.pyconf @@ -10,8 +10,8 @@ default : { rpm : [] rpm_dev : [] - apt : ['python3-yaml', 'libyaml'] - apt_dev : ['libyaml-dev'] + apt : ['python3-yaml'] + apt_dev : [] } environ : { @@ -28,13 +28,7 @@ default : } } -version_6_0_DB11: -{ - compil_script: "pyyaml-6.0.sh" - archive_info : {archive_name : "pyyaml-6.0-x86_64.tar.gz"} -} - -version_6_0_CO7: +version_6_0_x86_64: { compil_script: "pyyaml-6.0.sh" archive_info : {archive_name : "pyyaml-6.0-x86_64.tar.gz"} -- 2.39.2