diff options
| author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2024-09-14 23:04:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-14 15:04:46 -0600 |
| commit | 363215717d207c922c21c1309afd49ed135107e5 (patch) | |
| tree | 80559c5fc91cee7b926fc446fb2e64535bf34319 | |
| parent | ca46fec985ca4137c14570bc3a0ec5db6afbb08f (diff) | |
| download | spack-363215717d207c922c21c1309afd49ed135107e5.tar.gz spack-363215717d207c922c21c1309afd49ed135107e5.tar.bz2 spack-363215717d207c922c21c1309afd49ed135107e5.tar.xz spack-363215717d207c922c21c1309afd49ed135107e5.zip | |
py-awkward: add v2.6.6 and py-awkward-cpp v35 (#46372)
* py-awkward: add v2.6.6 and py-awkward-cpp v35
* Add dependencies on python and numpy
* Add a conflict with GCC 14
* Move conflict to py-awkward-cpp
* py-awkward: 2.1.1 depends on py-awkward-cpp@12
---------
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/py-awkward-cpp/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-awkward/package.py | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py index ba43f7a337..cc149dd981 100644 --- a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py @@ -18,6 +18,7 @@ class PyAwkwardCpp(PythonPackage): license("BSD-3-Clause") + version("35", sha256="1f8b112a597bd2438794e1a721a63aa61869fa9598a17ac6bd811ad6f6400d06") version("12", sha256="429f7fcc37a671afa67fe9680f2edc3a123d1c74d399e5889c654f9529f9f8f2") version("11", sha256="02d719a4da7487564b29b8e8b78925a32ac818b6f5572c2f55912b4e0e59c7a4") version("10", sha256="d1c856cb6ef5cf3d4f67506a7efc59239f595635865cc9f4ab18440b8bfb11c6") @@ -33,10 +34,15 @@ class PyAwkwardCpp(PythonPackage): depends_on("cxx", type="build") # generated depends_on("python@3.7:", type=("build", "run")) + depends_on("python@3.8:", type=("build", "run"), when="@19:") depends_on("py-scikit-build-core@0.2.0:+pyproject", when="@11:", type="build") depends_on("py-pybind11", type=("build", "link")) depends_on("py-numpy@1.17.0:", when="@12:", type=("build", "run")) + depends_on("py-numpy@1.18.0:", when="@19:", type=("build", "run")) # older versions depends_on("py-numpy@1.14.5:", when="@:11", type=("build", "run")) depends_on("py-scikit-build-core@0.1.3:+pyproject", when="@:9", type="build") + + # https://github.com/scikit-hep/awkward/issues/3132#issuecomment-2136042870 + conflicts("%gcc@14:", when="@:33") diff --git a/var/spack/repos/builtin/packages/py-awkward/package.py b/var/spack/repos/builtin/packages/py-awkward/package.py index eac61100ab..218c67b60a 100644 --- a/var/spack/repos/builtin/packages/py-awkward/package.py +++ b/var/spack/repos/builtin/packages/py-awkward/package.py @@ -18,6 +18,7 @@ class PyAwkward(PythonPackage): license("BSD-3-Clause") version("main", branch="main") + version("2.6.6", sha256="6eeb426ca41b51fe3c36fbe767b90259979b08c14e3562497a71195a447c8b3c") version("2.1.1", sha256="fda8e1634161b8b46b151c074ff0fc631fc0feaec2ec277c4b40a2095110b0dd") version("2.1.0", sha256="73f7a76a1fb43e2557befee54b1381f3e6d90636983cdc54da1c2bcb9ad4c1a8") version("2.0.10", sha256="8dae67afe50f5cf1677b4062f9b29dc7e6893420d0af5a0649364b117a3502af") @@ -66,7 +67,8 @@ class PyAwkward(PythonPackage): ("@2.0.8", "@9"), ("@2.0.9", "@10"), ("@2.0.10", "@11"), - ("@2.1.0:", "@12"), + ("@2.1.0:2.1.1", "@12"), + ("@2.6.6:", "@35"), ] for _awkward, _awkward_cpp in _awkward_to_awkward_cpp_map: depends_on("py-awkward-cpp{}".format(_awkward_cpp), when=_awkward, type=("build", "run")) @@ -74,9 +76,11 @@ class PyAwkward(PythonPackage): depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("python@3.6:", when="@1.9:", type=("build", "run")) depends_on("python@3.7:", when="@1.10:", type=("build", "run")) + depends_on("python@3.8:", when="@2.3:", type=("build", "run")) depends_on("py-numpy@1.13.1:", when="@:1", type=("build", "run")) depends_on("py-numpy@1.14.5:", when="@2.0", type=("build", "run")) depends_on("py-numpy@1.17.0:", when="@2.1:", type=("build", "run")) + depends_on("py-numpy@1.18.0:", when="@2.3:", type=("build", "run")) depends_on("py-pybind11", type=("build", "link")) depends_on("py-importlib-resources", when="@2: ^python@:3.8", type=("build", "run")) depends_on("py-typing-extensions@4.1:", when="@2: ^python@:3.10", type=("build", "run")) |