From a3a71cdea5195d91c4fa23be4c962383ec8bc4ee Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Fri, 23 Feb 2024 08:47:57 +0100 Subject: [PATCH] Modify sphinxintl python package name and clean sip compilation script --- applications/SALOME-master.pyconf | 6 +++--- products/compil_scripts/sip-5.5.0.sh | 3 --- products/sphinxintl.pyconf | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 5abca7e..d9f378c 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -51,7 +51,7 @@ APPLICATION : contourpy : '1.2.0' cppunit : '1.13.2' cycler : '0.10.0' - Cython : '0.29.12' + Cython : '0.29.37' dateutil : '2.7.3' docutils : '0.20.1' doxygen : '1.8.14' @@ -84,7 +84,7 @@ APPLICATION : medfile : '4.1.1' mesa : '19.0.8' MeshGems : '2.15-1' - mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} #'3.1.5' + mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} metis : '5.1.0' netgen : '5.3.1_with_CAS_7.2' # comment out line above and uncomment the line below to use Netgen 6. @@ -140,7 +140,7 @@ APPLICATION : sphinxcontrib_serializinghtml : '1.1.10' sphinxcontrib_websupport : '1.2.7' sphinx_rtd_theme : '2.0.0' - sphinxintl: '0.9.10' + sphinxintl: '2.1.0' statsmodels: '0.14.1' swig : '4.0.2' tabulate : '0.9.0' diff --git a/products/compil_scripts/sip-5.5.0.sh b/products/compil_scripts/sip-5.5.0.sh index dfee489..f573558 100755 --- a/products/compil_scripts/sip-5.5.0.sh +++ b/products/compil_scripts/sip-5.5.0.sh @@ -21,9 +21,6 @@ case $LINUX_DISTRIBUTION in ;; esac -$PYTHONBIN -m pip install --upgrade pip -$PYTHONBIN -m pip install --upgrade setuptools - # we don't install in python directory -> modify environment as described in INSTALL file export PATH=$(pwd)/bin:$PATH export PYTHONPATH=$(pwd):$PYTHONPATH diff --git a/products/sphinxintl.pyconf b/products/sphinxintl.pyconf index 11bc153..81e90b3 100644 --- a/products/sphinxintl.pyconf +++ b/products/sphinxintl.pyconf @@ -1,6 +1,6 @@ default : { - name : "sphinx_intl" + name : "sphinx-intl" build_source : "script" compil_script : 'pip_install' + $VARS.scriptExtension get_source : "archive" -- 2.39.2