From 01b79abcdf3422a3da9234c4b454ab5a28249380 Mon Sep 17 00:00:00 2001 From: haralmha <47558670+haralmha@users.noreply.github.com> Date: Tue, 10 May 2022 19:16:55 +0200 Subject: py-pyarrow: Add versions 8.0.0 and 7.0.0 (#30524) * py-pyarrow: Add version 7.0.0 * Add version constraints on dependencies * Add version 8.0.0 * arrow: Add version 8.0.0 * py-pyarrow: Allow version 8.0.0 of arrow --- var/spack/repos/builtin/packages/arrow/package.py | 1 + var/spack/repos/builtin/packages/py-pyarrow/package.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 501c1a4e2b..29d729d853 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -15,6 +15,7 @@ class Arrow(CMakePackage, CudaPackage): homepage = "https://arrow.apache.org" url = "https://github.com/apache/arrow/archive/apache-arrow-0.9.0.tar.gz" + version('8.0.0', sha256='19ece12de48e51ce4287d2dee00dc358fbc5ff02f41629d16076f77b8579e272') version('7.0.0', sha256='57e13c62f27b710e1de54fd30faed612aefa22aa41fa2c0c3bacd204dd18a8f3') version('4.0.1', sha256='79d3e807df4a179cfab1e7a1ab5f79d95f7b72ac2c33aba030febd125d77eb3b') version('3.0.0', sha256='fc461c4f0a60e7470a7c58b28e9344aa8fb0be5cc982e9658970217e084c3a82') diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py index 429ccf91fe..e20446f479 100644 --- a/var/spack/repos/builtin/packages/py-pyarrow/package.py +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -15,6 +15,8 @@ class PyPyarrow(PythonPackage, CudaPackage): homepage = "https://arrow.apache.org" pypi = 'pyarrow/pyarrow-0.17.1.tar.gz' + version('8.0.0', sha256='4a18a211ed888f1ac0b0ebcb99e2d9a3e913a481120ee9b1fe33d3fedb945d4e') + version('7.0.0', sha256='da656cad3c23a2ebb6a307ab01d35fce22f7850059cffafcb90d12590f8f4f38') version('4.0.1', sha256='11517f0b4f4acbab0c37c674b4d1aad3c3dfea0f6b1bb322e921555258101ab3') version('3.0.0', sha256='4bf8cc43e1db1e0517466209ee8e8f459d9b5e1b4074863317f2a965cf59889e') version('0.17.1', sha256='278d11800c2e0f9bea6314ef718b2368b4046ba24b6c631c14edad5a1d351e49') @@ -30,17 +32,23 @@ class PyPyarrow(PythonPackage, CudaPackage): depends_on('pkgconfig', type='build') depends_on('python@3.5:', type=('build', 'run'), when='@0.17:') depends_on('python@3.6:', type=('build', 'run'), when='@3.0.0:') + depends_on('python@3.7:', type=('build', 'run'), when='@7.0.0:') depends_on('py-setuptools', type='build') + depends_on('py-setuptools@38.6.0:', type='build', when='@7.0.0:') depends_on('py-setuptools-scm', type='build', when='@0.15.0:') depends_on('py-cython', type='build') depends_on('py-cython@0.29:', type='build', when='@0.15.0:') + depends_on('py-cython@0.29.22:', type='build', when='@8.0.0:') depends_on('py-numpy@1.14:', type=('build', 'run'), when='@0.15.0:') depends_on('py-numpy@1.16.6:', type=('build', 'run'), when='@3.0.0:') depends_on('py-six@1.0.0:', type=('build', 'run'), when='@0.15.0') depends_on('py-futures', type=('build', 'run'), when='@0.15.0:^python@:3.1') depends_on('py-enum34@1.1.6:', type=('build', 'run'), when='@0.15.0:^python@:3.3') - for v in ('@0.9.0', '@0.11.0', '@0.12.1', '@0.15.1', '@0.17.1', '@3.0.0', '@4.0.1'): + arrow_versions = ('@0.9.0', '@0.11.0', '@0.12.1', '@0.15.1', + '@0.17.1', '@3.0.0', '@4.0.1', '@7.0.0', + '@8.0.0') + for v in arrow_versions: depends_on('arrow+python' + v, when=v) depends_on('arrow+parquet+python' + v, when='+parquet' + v) depends_on('arrow+cuda' + v, when='+cuda' + v) -- cgit v1.2.3-70-g09d2