py-scipy: add v1.10.0 (#34799)

* py-scipy: add v1.10.0

* Update GCC/LAPACK version requirements

* Fix msvc version check

2 files changed, 33 insertions, 18 deletions

diff --git a/var/spack/repos/builtin/packages/py-pythran/package.py b/var/spack/repos/builtin/packages/py-pythran/package.py
index eba40ccaf3..611090264e 100644
--- a/var/spack/repos/builtin/packages/py-pythran/package.py
+++ b/var/spack/repos/builtin/packages/py-pythran/package.py
@@ -16,6 +16,7 @@ class PyPythran(PythonPackage):
     homepage = "https://github.com/serge-sans-paille/pythran"
     pypi = "pythran/pythran-0.9.11.tar.gz"
 
+    version("0.12.0", sha256="eff3dd0d3eebe57372f0d14f82985525e9bcdfb5b1d1010e1932cf9207060f9f")
     version("0.11.0", sha256="0b2cba712e09f7630879dff69f268460bfe34a6d6000451b47d598558a92a875")
     version("0.10.0", sha256="9dac8e1d50f33d4676003e350b1f0c878ce113e6f907920e92dc103352cac5bf")
     version("0.9.12", sha256="5d50dc74dca1d3f902941865acbae981fc24cceeb9d54673d68d6b5c8c1b0001")
@@ -29,27 +30,27 @@ class PyPythran(PythonPackage):
     version("0.9.4", sha256="ec9c91f5331454263b064027292556a184a9f55a50f8615e09b08f57a4909855")
     version("0.9.3", sha256="217427a8225a331fdc8f3efe57871aed775cdf2c6e847a0a83df0aaae4b02493")
 
-    depends_on("python@3:", when="@0.9.6:", type=("build", "run"))
-    depends_on("python@2.7:", when="@:0.9.5", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-pytest-runner", type="build", when="@:0.9")
     depends_on("py-ply@3.4:", type=("build", "run"))
-    depends_on("py-networkx@2:", when="@:0.9.11", type=("build", "run"))
-    depends_on("py-decorator", when="@:0.9.11", type=("build", "run"))
-    depends_on("py-gast@0.5.0:0.5", when="@0.9.12:", type=("build", "run"))
-    depends_on("py-gast@0.4.0:0.4", when="@0.9.7:0.9.11", type=("build", "run"))
+    depends_on("py-gast@0.5", when="@0.9.12:", type=("build", "run"))
+    depends_on("py-gast@0.4", when="@0.9.7:0.9.11", type=("build", "run"))
     depends_on("py-gast@0.3.3:0.3", when="@0.9.6", type=("build", "run"))
-    depends_on("py-gast@0.3.0:", when="@0.9.4:0.9.5", type=("build", "run"))
+    depends_on("py-gast@0.3:", when="@0.9.4:0.9.5", type=("build", "run"))
     depends_on("py-gast", when="@:0.9.3", type=("build", "run"))
-    depends_on("py-six", when="@:0.9.11", type=("build", "run"))
     depends_on("py-numpy", type=("build", "run"))
-    depends_on("py-beniget@0.4.0:0.4", when="@0.9.12:", type=("build", "run"))
-    depends_on("py-beniget@0.3.0:0.3", when="@0.9.7:0.9.11", type=("build", "run"))
+    depends_on("py-beniget@0.4", when="@0.9.12:", type=("build", "run"))
+    depends_on("py-beniget@0.3", when="@0.9.7:0.9.11", type=("build", "run"))
     depends_on("py-beniget@0.2.1:0.2", when="@0.9.6", type=("build", "run"))
-    depends_on("py-beniget@0.2.0:", when="@0.9.4:0.9.5", type=("build", "run"))
+    depends_on("py-beniget@0.2:", when="@0.9.4:0.9.5", type=("build", "run"))
     depends_on("py-beniget", when="@:0.9.3", type=("build", "run"))
     depends_on("llvm-openmp", when="%apple-clang", type=("build", "run"))
 
+    # Historical dependencies
+    depends_on("py-pytest-runner", type="build", when="@:0.9")
+    depends_on("py-networkx@2:", when="@:0.9.11", type=("build", "run"))
+    depends_on("py-decorator", when="@:0.9.11", type=("build", "run"))
+    depends_on("py-six", when="@:0.9.11", type=("build", "run"))
+
     # https://github.com/serge-sans-paille/pythran/pull/1856
     patch("omp.patch", when="@0.9.10:0.9.12")
 
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index f20cc6f9f3..f43874e435 100644
--- a/var/spack/repos/builtin/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
@@ -21,6 +21,7 @@ class PyScipy(PythonPackage):
     maintainers = ["adamjstewart", "rgommers"]
 
     version("master", branch="master")
+    version("1.10.0", sha256="c8b3cbc636a87a89b770c6afc999baa6bcbb01691b5ccbbc1b1791c7c0a07540")
     version("1.9.3", sha256="fbc5c05c85c1a02be77b1ff591087c83bc44579c6d2bd9fb798bb64ea5e1a027")
     version("1.9.2", sha256="99e7720caefb8bca6ebf05c7d96078ed202881f61e0c68bd9e0f3e8097d6f794")
     version("1.9.1", sha256="26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9")
@@ -55,14 +56,16 @@ class PyScipy(PythonPackage):
     # https://github.com/mesonbuild/meson-python/pull/167
     depends_on("py-build", when="@1.9:", type="build")
 
-    depends_on("py-meson-python@0.9:", when="@1.9.2:", type="build")
+    depends_on("py-meson-python@0.11", when="@1.10:", type="build")
+    depends_on("py-meson-python@0.9:", when="@1.9.2:1.9", type="build")
     depends_on("py-meson-python@0.8.1:", when="@1.9.1", type="build")
     depends_on("py-meson-python@0.7", when="@1.9.0", type="build")
     depends_on("meson@0.62.2", when="@1.9.0:1.9.1", type="build")
     depends_on("py-cython@0.29.32:2", when="@1.9.2:", type="build")
     depends_on("py-cython@0.29.21:2", when="@1.9:", type="build")
     depends_on("py-cython@0.29.18:2", when="@1.7:", type="build")
-    depends_on("py-pybind11@2.4.3:2.10", when="@1.9.1:", type=("build", "link"))
+    depends_on("py-pybind11@2.10.1", when="@1.10:", type=("build", "link"))
+    depends_on("py-pybind11@2.4.3:2.10", when="@1.9.1:1.9", type=("build", "link"))
     depends_on("py-pybind11@2.4.3:2.9", when="@1.9.0", type=("build", "link"))
     depends_on("py-pybind11@2.4.3:2.8", when="@1.8", type=("build", "link"))
     depends_on("py-pybind11@2.4.3:2.7", when="@1.7.2:1.7", type=("build", "link"))
@@ -70,18 +73,21 @@ class PyScipy(PythonPackage):
     depends_on("py-pybind11@2.4.3:", when="@1.5:1.6.1", type=("build", "link"))
     depends_on("py-pybind11@2.4.0:", when="@1.4.1:1.4", type=("build", "link"))
     depends_on("py-pybind11@2.2.4:", when="@1.4.0", type=("build", "link"))
-    depends_on("py-pythran@0.9.12:0.12", when="@1.9.2:", type=("build", "link"))
+    depends_on("py-pythran@0.12", when="@1.10:", type=("build", "link"))
+    depends_on("py-pythran@0.9.12:0.12", when="@1.9.2:1.9", type=("build", "link"))
     depends_on("py-pythran@0.9.12:0.11", when="@1.9.0:1.9.1", type=("build", "link"))
     depends_on("py-pythran@0.10", when="@1.8", type=("build", "link"))
     depends_on("py-pythran@0.9.12:0.9", when="@1.7.2:1.7", type=("build", "link"))
     depends_on("py-pythran@0.9.11", when="@1.7.0:1.7.1", type=("build", "link"))
-    depends_on("py-wheel@:0.37", type="build")
+    depends_on("py-wheel@:0.38", when="@1.10:", type="build")
+    depends_on("py-wheel@:0.37", when="@:1.9", type="build")
     depends_on("pkgconfig", when="@1.9:", type="build")
     depends_on("py-setuptools", when="@:1.8", type="build")
     depends_on("py-setuptools@:59", when="@1.8", type="build")
     depends_on("py-setuptools@:57", when="@1.7", type="build")
     depends_on("py-setuptools@:51.0.0", when="@1.6", type="build")
-    depends_on("py-numpy@1.18.5:1.25+blas+lapack", when="@1.9:", type=("build", "link", "run"))
+    depends_on("py-numpy@1.19.5:1.26+blas+lapack", when="@1.10:", type=("build", "link", "run"))
+    depends_on("py-numpy@1.18.5:1.25+blas+lapack", when="@1.9", type=("build", "link", "run"))
     depends_on("py-numpy@1.17.3:1.24+blas+lapack", when="@1.8", type=("build", "link", "run"))
     depends_on(
         "py-numpy@1.16.5:1.22+blas+lapack", when="@1.6.2:1.7", type=("build", "link", "run")
@@ -105,9 +111,17 @@ class PyScipy(PythonPackage):
     # and setup_build_environment() from numpy in the scipy spec.
     depends_on("blas")
     depends_on("lapack")
-    # https://github.com/scipy/scipy/wiki/Dropping-support-for-Accelerate
+
+    # https://docs.scipy.org/doc/scipy/dev/toolchain.html#other-libraries
+    depends_on("lapack@3.7.1:", when="@1.9:")
     depends_on("lapack@3.4.1:", when="@1.2:")
 
+    # https://docs.scipy.org/doc/scipy/dev/toolchain.html#compilers
+    conflicts("%gcc@:7", when="@1.10:")
+    conflicts("%gcc@:4.7", when="@:1.9")
+    conflicts("%apple-clang@:9", when="@1.10:")
+    conflicts("%msvc@:19.19", when="@1.10:")
+
     # https://github.com/scipy/scipy/pull/11324
     conflicts("@1.4.0:1.4.1", when="target=ppc64le:")