From 72177b6e97ed00449fe19474b477e268860d9a8b Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 21 Oct 2019 11:17:52 -0500 Subject: Add latest version of py-tables (#13291) * Add latest version of py-tables * setup_environment -> setup_build_environment --- var/spack/repos/builtin/packages/py-tables/package.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py index e837cc9d7d..2fcb494c6c 100644 --- a/var/spack/repos/builtin/packages/py-tables/package.py +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -11,12 +11,13 @@ class PyTables(PythonPackage): efficiently and easily cope with extremely large amounts of data.""" homepage = "http://www.pytables.org/" - url = "https://github.com/PyTables/PyTables/archive/v3.5.2.tar.gz" + url = "https://github.com/PyTables/PyTables/archive/v3.6.0.tar.gz" import_modules = [ 'tables', 'tables.misc', 'tables.nodes', 'tables.scripts' ] + version('3.6.0', sha256='2dcd077f42b195f48aa00f5a720b79189ea92fba0d16ad35e2881e403ba6914e') version('3.5.2', sha256='e4fc6f1194f02a8b10ff923e77364fb70710592f620d7de35f4d4e064dc70e91') version('3.4.4', sha256='c9682c0f35d8175e12bbd38d925bdb606d47b7c8e358ba056a9dbf3b1f183114') version('3.3.0', sha256='dceb15fef556a2775121bcc695561df4ff0e09248e0ce3a2d58f5244a9f61421') @@ -28,12 +29,13 @@ class PyTables(PythonPackage): variant('lzo', default=False, description='Support for lzo compression') # requirements.txt + depends_on('python@3.5:', when='@3.4:', type=('build', 'run')) depends_on('python@2.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-cython', type='build') + depends_on('py-cython@0.21:', type='build') depends_on('py-numpy@1.9.3:', type=('build', 'run')) depends_on('py-numexpr@2.6.2:', type=('build', 'run')) - depends_on('py-six@1.9.0:', type=('build', 'run')) + depends_on('py-six@1.9.0:', when='@:3.5', type=('build', 'run')) depends_on('py-mock@2.0:', type='test') # tables/req_versions.py depends_on('hdf5@1.8.4:1.8.999', when='@:3.3.99') @@ -45,11 +47,11 @@ class PyTables(PythonPackage): depends_on('bzip2', when='+bzip2') depends_on('lzo', when='+lzo') - def setup_environment(self, spack_env, run_env): - spack_env.set('HDF5_DIR', self.spec['hdf5'].prefix) + def setup_build_environment(self, env): + env.set('HDF5_DIR', self.spec['hdf5'].prefix) if '+bzip2' in self.spec: - spack_env.set('BZIP2_DIR', self.spec['bzip2'].prefix) + env.set('BZIP2_DIR', self.spec['bzip2'].prefix) if '+lzo' in self.spec: - spack_env.set('LZO_DIR', self.spec['lzo'].prefix) + env.set('LZO_DIR', self.spec['lzo'].prefix) if '^c-blosc' in self.spec: - spack_env.set('BLOSC_DIR', self.spec['c-blosc'].prefix) + env.set('BLOSC_DIR', self.spec['c-blosc'].prefix) -- cgit v1.2.3-70-g09d2