From 5c5d6cad4437d3a42844f33fc91067660e7cc7af Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 25 Jun 2019 20:32:49 -0500 Subject: Rename py-pytables -> py-tables (#11847) --- .../builtin/packages/partitionfinder/package.py | 2 +- .../repos/builtin/packages/py-pytables/package.py | 45 ---------------------- .../repos/builtin/packages/py-sfepy/package.py | 2 +- .../repos/builtin/packages/py-tables/package.py | 45 ++++++++++++++++++++++ 4 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/py-pytables/package.py create mode 100644 var/spack/repos/builtin/packages/py-tables/package.py diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py index 78b70da135..930492c04f 100644 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ b/var/spack/repos/builtin/packages/partitionfinder/package.py @@ -19,7 +19,7 @@ class Partitionfinder(Package): depends_on('python@2.7.10:2.999', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) - depends_on('py-pytables', type=('build', 'run')) + depends_on('py-tables', type=('build', 'run')) depends_on('py-pyparsing', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) depends_on('py-scikit-learn', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py deleted file mode 100644 index 30f526e625..0000000000 --- a/var/spack/repos/builtin/packages/py-pytables/package.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack import * - - -class PyPytables(PythonPackage): - """PyTables is a package for managing hierarchical datasets and designed to - efficiently and easily cope with extremely large amounts of data.""" - homepage = "http://www.pytables.org/" - url = "https://github.com/PyTables/PyTables/archive/v3.3.0.tar.gz" - - version('3.4.4', '2cd52095ebb097f5bf58fa65dc6574bb') - version('3.3.0', '056c161ae0fd2d6e585b766adacf3b0b') - version('3.2.2', '7cbb0972e4d6580f629996a5bed92441', - url='https://github.com/PyTables/PyTables/archive/v.3.2.2.tar.gz') - - variant('bzip2', default=False, description='Support for bzip2 compression') - variant('lzo', default=False, description='Support for lzo compression') - - depends_on('bzip2', when='+bzip2') - depends_on('lzo', when='+lzo') - - # Versions prior to 3.3 must build with the internal blosc due to a lock - # problem in a multithreaded environment. - depends_on('hdf5-blosc', when="@3.3.0:") - - depends_on('hdf5@1.8.0:1.8.999', when="@:3.3.99") - depends_on('hdf5@1.8.0:1.10.999', when="@3.4.0:") - depends_on('py-numpy@1.8.0:', type=('build', 'run')) - depends_on('py-numexpr@2.5.2:', type=('build', 'run')) - depends_on('py-cython', type=('build', 'run')) - depends_on('py-six', type=('build', 'run')) - depends_on('py-setuptools', type=('build', 'run')) - - def setup_environment(self, spack_env, run_env): - spack_env.set('HDF5_DIR', self.spec['hdf5'].prefix) - if '+bzip2' in self.spec: - spack_env.set('BZIP2_DIR', self.spec['bzip2'].prefix) - if '+lzo' in self.spec: - spack_env.set('LZO_DIR', self.spec['lzo'].prefix) - if '+hdf5-blosc' in self.spec: - spack_env.set('BLOSC_DIR', self.spec['c-blosc'].prefix) diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index 17427283e3..11dca452e6 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -27,5 +27,5 @@ class PySfepy(PythonPackage): depends_on('py-matplotlib', type='run') depends_on('py-sympy', type='run') depends_on('hdf5+hl', type='run') - depends_on('py-pytables', type='run') + depends_on('py-tables', type='run') depends_on('py-petsc4py', type='run', when='+petsc') diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py new file mode 100644 index 0000000000..da62a38f5f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -0,0 +1,45 @@ +# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyTables(PythonPackage): + """PyTables is a package for managing hierarchical datasets and designed to + efficiently and easily cope with extremely large amounts of data.""" + homepage = "http://www.pytables.org/" + url = "https://github.com/PyTables/PyTables/archive/v3.3.0.tar.gz" + + version('3.4.4', '2cd52095ebb097f5bf58fa65dc6574bb') + version('3.3.0', '056c161ae0fd2d6e585b766adacf3b0b') + version('3.2.2', '7cbb0972e4d6580f629996a5bed92441', + url='https://github.com/PyTables/PyTables/archive/v.3.2.2.tar.gz') + + variant('bzip2', default=False, description='Support for bzip2 compression') + variant('lzo', default=False, description='Support for lzo compression') + + depends_on('bzip2', when='+bzip2') + depends_on('lzo', when='+lzo') + + # Versions prior to 3.3 must build with the internal blosc due to a lock + # problem in a multithreaded environment. + depends_on('hdf5-blosc', when="@3.3.0:") + + depends_on('hdf5@1.8.0:1.8.999', when="@:3.3.99") + depends_on('hdf5@1.8.0:1.10.999', when="@3.4.0:") + depends_on('py-numpy@1.8.0:', type=('build', 'run')) + depends_on('py-numexpr@2.5.2:', type=('build', 'run')) + depends_on('py-cython', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) + depends_on('py-setuptools', type=('build', 'run')) + + def setup_environment(self, spack_env, run_env): + spack_env.set('HDF5_DIR', self.spec['hdf5'].prefix) + if '+bzip2' in self.spec: + spack_env.set('BZIP2_DIR', self.spec['bzip2'].prefix) + if '+lzo' in self.spec: + spack_env.set('LZO_DIR', self.spec['lzo'].prefix) + if '+hdf5-blosc' in self.spec: + spack_env.set('BLOSC_DIR', self.spec['c-blosc'].prefix) -- cgit v1.2.3-70-g09d2