diff options
| author | Stephen Hudson <shudson@anl.gov> | 2019-08-27 18:39:43 -0500 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-08-27 16:39:43 -0700 |
| commit | cd5b97f3fd74489805ddac0e1d1738395712ac42 (patch) | |
| tree | 08783c779db07397db8da4a5bc7bfbf425640256 | |
| parent | bf7cb3dca9c95782ff83fb54f095a00eeb96ddc9 (diff) | |
| download | spack-cd5b97f3fd74489805ddac0e1d1738395712ac42.tar.gz spack-cd5b97f3fd74489805ddac0e1d1738395712ac42.tar.bz2 spack-cd5b97f3fd74489805ddac0e1d1738395712ac42.tar.xz spack-cd5b97f3fd74489805ddac0e1d1738395712ac42.zip | |
libensemble package: add version 0.5.2 (#12514)
* Make mpi, scipy, petsc4py, and nlopt support optional
* Later versions depend on python@3.5:
* Versions before 0.4.1 must build with MPI: add a conflict for
@:0.4.1~mpi
| -rw-r--r-- | var/spack/repos/builtin/packages/py-libensemble/package.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index b24da8fefa..4cfdf304a7 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -11,10 +11,11 @@ class PyLibensemble(PythonPackage): """Library for managing ensemble-like collections of computations.""" homepage = "https://libensemble.readthedocs.io" - url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.5.1.tar.gz" + url = "https://pypi.io/packages/source/l/libensemble/libensemble-0.5.2.tar.gz" git = "https://github.com/Libensemble/libensemble.git" version('develop', branch='develop') + version('0.5.2', sha256='3e36c29a4a2adc0984ecfcc998cb5bb8a2cdfbe7a1ae92f7b35b06e41d21b889') version('0.5.1', sha256='522e0cc086a3ed75a101b704c0fe01eae07f2684bd8d6da7bdfe9371d3187362') version('0.5.0', sha256='c4623171dee049bfaa38a9c433609299a56b1afb774db8b71321247bc7556b8f') version('0.4.1', sha256='282c32ffb79d84cc80b5cc7043c202d5f0b8ebff10f63924752f092e3938db5e') @@ -23,13 +24,22 @@ class PyLibensemble(PythonPackage): version('0.2.0', 'ee96047594a3f5a1533f24d3b1f365f9') version('0.1.0', '0c3d45dd139429de1a5273e5bd8e46ec') - depends_on('python@3.4:', when='@0.5.0:') - depends_on('python@2.7:2.8,3.3:', when='@:0.4.1') + variant('mpi', default=False, description='Install with MPI') + variant('scipy', default=False, description='Install with scipy') + variant('petsc4py', default=False, description='Install with petsc4py') + variant('nlopt', default=False, description='Install with nlopt') + + # depends_on('python@2.7:2.8,3.3:', when='@:0.4.1') + # depends_on('python@3.5:', when='@0.5.0:') + depends_on('python@3.5:') depends_on('py-setuptools', type='build') - depends_on('mpi') - depends_on('py-mpi4py@2.0:', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) - depends_on('py-scipy', type=('build', 'run')) - depends_on('py-petsc4py', type=('build', 'run')) - depends_on('py-petsc4py@develop', type=('build', 'run'), when='@develop') - depends_on('nlopt', type=('build', 'run')) + depends_on('mpi', when='@:0.4.1') + depends_on('mpi', when='+mpi') + depends_on('py-mpi4py@2.0:', type=('build', 'run'), when='@:0.4.1') + depends_on('py-mpi4py@2.0:', type=('build', 'run'), when='+mpi') + depends_on('py-scipy', type=('build', 'run'), when='+scipy') + depends_on('py-petsc4py', type=('build', 'run'), when='+petsc4py') + depends_on('py-petsc4py@develop', type=('build', 'run'), when='@develop+petsc4py') + depends_on('nlopt', type=('build', 'run'), when='+nlopt') + conflicts('~mpi', when='@:0.4.1') |