diff options
3 files changed, 25 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/py-meson-python/package.py b/var/spack/repos/builtin/packages/py-meson-python/package.py index 0b1a2f4ae1..8c63595a4f 100644 --- a/var/spack/repos/builtin/packages/py-meson-python/package.py +++ b/var/spack/repos/builtin/packages/py-meson-python/package.py @@ -15,8 +15,11 @@ class PyMesonPython(PythonPackage): maintainers("eli-schwartz", "adamjstewart", "rgommers") # Needed for py-scikit-image, deprecate and remove once 0.13.0 is officially released + version("0.13.1", sha256="63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618") version( - "0.13.0.pre0", sha256="8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95" + "0.13.0.pre0", + sha256="8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95", + deprecated=True, ) version("0.12.0", sha256="8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d") version("0.11.0", sha256="110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09") @@ -26,6 +29,7 @@ class PyMesonPython(PythonPackage): version("0.8.0", sha256="b5c8a2727e6f6feaffc1db513244c9bdb5d0f689b45e24f4529b649b7710daf7") version("0.7.0", sha256="9fcfa350f44ca80dd4f5f9c3d251725434acf9a07d9618f382e6cc4629dcbe84") + depends_on("py-colorama", when="platform=windows", type=("build", "run")) depends_on("meson@0.63.3:", when="@0.11:", type=("build", "run")) depends_on("meson@0.63:", when="@0.9:0.10", type=("build", "run")) depends_on("meson@0.62:", type=("build", "run")) @@ -34,11 +38,13 @@ class PyMesonPython(PythonPackage): depends_on("py-pyproject-metadata@0.5:", type=("build", "run")) depends_on("py-tomli@1:", when="@0.11: ^python@:3.10", type=("build", "run")) depends_on("py-tomli@1:", when="@:0.10", type=("build", "run")) - depends_on("py-typing-extensions@3.7.4:", when="@0.12: ^python@:3.9", type=("build", "run")) - depends_on("py-typing-extensions@3.7.4:", when="@:0.11 ^python@:3.7", type=("build", "run")) - depends_on("py-colorama", when="platform=windows", type=("build", "run")) + depends_on("py-setuptools@60:", when="@0.13: ^python@3.12:", type=("build", "run")) # https://github.com/mesonbuild/meson-python/pull/111 conflicts("platform=darwin os=ventura", when="@:0.7") conflicts("platform=darwin os=monterey", when="@:0.7") conflicts("platform=darwin os=bigsur", when="@:0.7") + + # Historical dependencies + depends_on("py-typing-extensions@3.7.4:", when="@0.12 ^python@:3.9", type=("build", "run")) + depends_on("py-typing-extensions@3.7.4:", when="@:0.11 ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index d320b46023..03451ac721 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -27,6 +27,7 @@ class PyPybind11(CMakePackage, PythonExtension): maintainers("ax3l") version("master", branch="master") + version("2.10.4", sha256="832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970") version("2.10.1", sha256="111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad") version("2.10.0", sha256="eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec") version("2.9.2", sha256="6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1") diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 9dea18d5cb..8ad772ddc7 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.11.0", sha256="f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d") version("1.10.1", sha256="2cf9dfb80a7b4589ba4c40ce7588986d6d5cebc5457cad2c2880f6bc2d42f3a5") version("1.10.0", sha256="c8b3cbc636a87a89b770c6afc999baa6bcbb01691b5ccbbc1b1791c7c0a07540") version("1.9.3", sha256="fbc5c05c85c1a02be77b1ff591087c83bc44579c6d2bd9fb798bb64ea5e1a027") @@ -54,7 +55,8 @@ class PyScipy(PythonPackage): version("1.1.0", sha256="878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1") # Based on wheel availability on PyPI - depends_on("python@3.8:3.11", when="@1.9.2:", type=("build", "link", "run")) + depends_on("python@3.9:3.12", when="@1.11:", type=("build", "link", "run")) + depends_on("python@3.8:3.11", when="@1.9.2:1.10", type=("build", "link", "run")) depends_on("python@3.8:3.10", when="@1.8:1.9.1", type=("build", "link", "run")) depends_on("python@:3.10", when="@1.7.2:1.7", type=("build", "link", "run")) depends_on("python@:3.9", when="@1.5.4:1.7.1", type=("build", "link", "run")) @@ -65,16 +67,19 @@ 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.11:0.12", when="@1.10.1:", type="build") + depends_on("py-meson-python@0.12.1:0.13", when="@1.11:", type="build") + depends_on("py-meson-python@0.11:0.12", when="@1.10.1:1.10", type="build") depends_on("py-meson-python@0.11", when="@1.10.0", 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.35:2", when="@1.11:", 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.10.1", when="@1.10:", type=("build", "link")) + depends_on("py-pybind11@2.10.4:2.10", when="@1.11:", 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")) @@ -83,20 +88,23 @@ 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.12", when="@1.10:", type="build") + depends_on("py-pythran@0.12:0.13", when="@1.11:", type="build") + depends_on("py-pythran@0.12", when="@1.10", type="build") depends_on("py-pythran@0.9.12:0.12", when="@1.9.2:1.9", type="build") depends_on("py-pythran@0.9.12:0.11", when="@1.9.0:1.9.1", type="build") depends_on("py-pythran@0.10", when="@1.8", type="build") depends_on("py-pythran@0.9.12:0.9", when="@1.7.2:1.7", type="build") depends_on("py-pythran@0.9.11", when="@1.7.0:1.7.1", type="build") - depends_on("py-wheel@:0.38", when="@1.10:", type="build") + depends_on("py-wheel@:0.40", when="@1.11:", 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.19.5:1.26+blas+lapack", when="@1.10:", type=("build", "link", "run")) + depends_on("py-numpy@1.21.6:1.27+blas+lapack", when="@1.11:", 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( |