Fix sphinx archive name for old version (1.7.6); Update XDATA git_info to the new...

diff --git a/products/Sphinx.pyconf b/products/Sphinx.pyconf
index d428b6d3f621bab721d3ccbafe140f3b16c08cb2..b6e865ca0320f82ae05bc04a75c6c5c7a215dfa1 100644 (file)
--- a/products/Sphinx.pyconf
+++ b/products/Sphinx.pyconf
@@ -51,6 +51,7 @@ version_2_1_2:
 
 version_1_7_6:
 {
+    archive_info : {archive_prefix : "Sphinx"}
     depend : ["Python", "setuptools", "six", "Pygments", "Jinja2", "docutils", "sphinxcontrib_websupport", "packaging", "requests", "imagesize", "alabaster", "Babel", "snowballstemmer"]
     opt_depend : []
 }

diff --git a/products/XDATA.pyconf b/products/XDATA.pyconf
index 328932ec85a1208c86400a2b0e0f7ada1bf5384a..1d561d9e75fd572a99145a03f59c8d699a7f8fb4 100644 (file)
--- a/products/XDATA.pyconf
+++ b/products/XDATA.pyconf
@@ -5,10 +5,10 @@ default :
     get_source : "git"
     git_info:
     {
-      repositories :
-      {
-        tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "oscar/xdata.git"
-      }
+       repositories :
+       {
+               tuleap : $PROJECTS.projects.salome.git_info.git_server.tuleap.url + "oscar/xdata.git"
+       }
     }
     environ :
     {
@@ -25,11 +25,6 @@ default :
     }
 }
 
-version_V9_2_1_UB22_04 :
-{
-  patches: ['xdata-9.2.1-python-3.10.patch']
-}
-
 version_0_9_11 :
 {
     name : "XDATA"

diff --git a/products/patches/scipy-1.4.1_limit_pybind11_version_for_py36.patch b/products/patches/scipy-1.4.1_limit_pybind11_version_for_py36.patch
new file mode 100644 (file)
index 0000000..a474689
--- /dev/null
+++ b/products/patches/scipy-1.4.1_limit_pybind11_version_for_py36.patch
@@ -0,0 +1,11 @@
+--- scipy/setup.py     2019-12-18 20:30:00.000000000 +0100
++++ scipy_dev/setup.py 2024-07-05 14:15:46.919681412 +0200
+@@ -472,7 +472,7 @@
+                           else [])
+ 
+     install_requires = build_requires
+-    setup_requires = build_requires + ['pybind11>=2.4.0']
++    setup_requires = build_requires + ['pybind11>=2.4.0, !=2.13.*']
+ 
+     metadata = dict(
+         name='scipy',

diff --git a/products/scipy.pyconf b/products/scipy.pyconf
index cc7a1f6bd7bcc86a4583175ce79d85ef0fb3561f..9eefb6f9f0345576959f1a4ac9a8a3a0edce4ca5 100755 (executable)
--- a/products/scipy.pyconf
+++ b/products/scipy.pyconf
@@ -50,6 +50,16 @@ version_1_6_2_win:
   opt_depend : ['pybind11', 'openblas']
 }
 
+version_1_4_1 :
+{
+    patches : [ "scipy-1.4.1_limit_pybind11_version_for_py36.patch" ]
+    properties :
+    {
+      incremental : "yes"
+      pip : "no"
+    }
+}
+
 version_1_5_2_no_pip :
 {
     compil_script : "scipy-1.5.2.sh"