summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-numexpr/package.py8
-rw-r--r--var/spack/repos/builtin/packages/py-numpy/package.py1
2 files changed, 7 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py
index 0d8db064f4..0bd9ff9986 100644
--- a/var/spack/repos/builtin/packages/py-numexpr/package.py
+++ b/var/spack/repos/builtin/packages/py-numexpr/package.py
@@ -12,6 +12,7 @@ class PyNumexpr(PythonPackage):
homepage = "https://github.com/pydata/numexpr"
url = "https://github.com/pydata/numexpr/archive/v2.7.0.tar.gz"
+ version("2.8.3", sha256="389ceefca74eff30ec3fd03fc4c3b7ab3df8f22d1f235117a392ce702ed208c0")
version("2.7.3", sha256="00d6b1518605afe0ed10417e0ff07123e5d531c02496c6eed7dd4b9923238e1e")
version("2.7.2", sha256="7d1b3790103221feda07f4a93a4fa5c6654f46865197a677ca6f27eb5cb4e5ef")
version("2.7.0", sha256="1923f038b90cc69635871968ed742be7775c879451c612f173c2547c823c9561")
@@ -21,8 +22,11 @@ class PyNumexpr(PythonPackage):
version("2.5", sha256="4ca111a9a27c9513c2e2f5b70c0a84ea69081d7d8e4512d4c3f26a485292de0d")
version("2.4.6", sha256="2681faf55a3f19ba4424cc3d6f0a10610ebd49f029f8453f0ba64dd5c0fe4e0f")
- depends_on("python@2.7:", when="@2.7.3:", type=("build", "run"))
+ depends_on("python@3.7:", when="@2.8.3:", type=("build", "run"))
+ depends_on("python@2.7:", when="@2.7.3", type=("build", "run"))
depends_on("python@2.6:", when="@:2.7.2", type=("build", "run"))
# https://github.com/pydata/numexpr/issues/397
- depends_on("py-numpy@1.7:1.22", type=("build", "run"))
+ depends_on("py-numpy@1.7:1.22", type=("build", "run"), when="@:2.7")
+ depends_on("py-numpy@1.13.3:", type=("build", "run"), when="@2.8.3:")
depends_on("py-setuptools", type="build")
+ depends_on("py-packaging", type=("build", "run"), when="@2.8.3:")
diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py
index 76210b1573..85601bb81a 100644
--- a/var/spack/repos/builtin/packages/py-numpy/package.py
+++ b/var/spack/repos/builtin/packages/py-numpy/package.py
@@ -161,6 +161,7 @@ class PyNumpy(PythonPackage):
# Newer versions will not build with Intel https://github.com/numpy/numpy/issues/22011
conflicts("%intel", when="@1.23.0:")
+ conflicts("%oneapi", when="@1.23.0:")
def url_for_version(self, version):
url = "https://files.pythonhosted.org/packages/source/n/numpy/numpy-{}.{}"