Modify sphinxintl python package name and clean sip compilation script

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5abca7eb698aec89773905a5cfd47b43abb0c0db..d9f378cb6e012bf4e13a4643cc47b0f554af59ba 100644 (file)
--- 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 dfee48926cbdd81f4812ec0132eac073c83c292e..f5735585445138803981837a106333b2b698ec27 100755 (executable)
--- 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 11bc153547d02ad79b1a50812207321139af1f15..81e90b358cf4eff97a6c0d82f97a5e5a4891ed12 100644 (file)
--- 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"