diff options
| author | Harsh Bhatia <bhatia4@llnl.gov> | 2020-04-15 18:11:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 20:11:48 -0500 |
| commit | 29e2475a68c21f74117be2616f96378b4e7a1709 (patch) | |
| tree | 4796a75b1e8c576842dc579adeab87d0d997e5d3 | |
| parent | 05afce85fa454d878bc82266d23fdc3a25208c01 (diff) | |
| download | spack-29e2475a68c21f74117be2616f96378b4e7a1709.tar.gz spack-29e2475a68c21f74117be2616f96378b4e7a1709.tar.bz2 spack-29e2475a68c21f74117be2616f96378b4e7a1709.tar.xz spack-29e2475a68c21f74117be2616f96378b4e7a1709.zip | |
update: memsurfer with python3 (#15636)
* update: memsurfer with python3
* flake8 compliance
* Update var/spack/repos/builtin/packages/memsurfer/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/memsurfer/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/memsurfer/package.py
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* removed build_type preferences at adamjstewart's suggestion
* Added build/run dependency on python3.7
as suggested by adam stewart
* more flake8 horror!
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/memsurfer/package.py | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/memsurfer/package.py b/var/spack/repos/builtin/packages/memsurfer/package.py index 8dab3f0356..82c1aae587 100644 --- a/var/spack/repos/builtin/packages/memsurfer/package.py +++ b/var/spack/repos/builtin/packages/memsurfer/package.py @@ -12,32 +12,34 @@ class Memsurfer(PythonPackage): wide variety of large-scale molecular simulations.""" homepage = "https://github.com/LLNL/MemSurfer" - git = "git@github.com:LLNL/MemSurfer.git" - # url = "https://github.com/LLNL/MemSurfer/archive/1.0.tar.gz" + git = "https://github.com/LLNL/MemSurfer.git" + maintainers = ['bhatiaharsh'] - # version('1.0', sha256='06e06eba88754b0c073f1c770981f7bdd501082986e4fbe28399be23b50138de') - version('1.0', tag='v1.0', submodules=True) - version('master', branch='master', submodules=True) - # version('test', branch='ppoisson', submodules=True) + version('1.0', tag='v1.0', submodules=True) + version('master', branch='master', submodules=True) + version('develop', branch='develop', submodules=True) - variant('vtkmesa', default=False, description='Enable OSMesa support for VTK') + variant('osmesa', default=False, + description='Enable OSMesa support (for VTK)') - extends('python@2.7.16') - depends_on('cmake@3.14:') - depends_on('swig@3.0.12') - depends_on('py-cython') - depends_on('py-numpy') - depends_on('py-pip') + extends('python@3.7:') + depends_on('python@3.7:', type=('build', 'run')) + + depends_on('cmake@3.14:', type='build') + depends_on('swig@3.0.12', type='build') + + depends_on('py-cython', type='build') + depends_on('py-numpy', type=('build', 'run')) depends_on('eigen@3.3.7') depends_on('cgal@4.13 +shared~core~demos~imageio') # vtk needs to know whether to build with mesa or opengl - depends_on('vtk@8.1.2 +python+opengl2~mpi~haru', when='~vtkmesa') - depends_on('vtk@8.1.2 +python+opengl2~mpi~haru +osmesa', when='+vtkmesa') + vtk_conf = '~ffmpeg~mpi+opengl2~qt~xdmf+python' + depends_on('vtk@8.1.2 ' + vtk_conf + ' ~osmesa', when='~osmesa') + depends_on('vtk@8.1.2 ' + vtk_conf + ' +osmesa', when='+osmesa') - # this is needed only to resolve the conflict between - # the default and netcdf's spec + # needed only to resolve the conflict between the default and netcdf's spec depends_on('hdf5 +hl') # memsurfer's setup needs path to these deps to build extension modules |