diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-23 16:03:31 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-23 16:03:31 -0800 |
| commit | 9bc27561ec369b6e9748a3741ad79515576fd666 (patch) | |
| tree | 98dc0fbcbd4a96e1163d24e832d962aa4c5618cb | |
| parent | 76100a6f084324e298604a42a58b18e0616689e2 (diff) | |
| parent | b98c25c1fba8b4e7f11d0c2094cf3f05ef2fe5b6 (diff) | |
| download | spack-9bc27561ec369b6e9748a3741ad79515576fd666.tar.gz spack-9bc27561ec369b6e9748a3741ad79515576fd666.tar.bz2 spack-9bc27561ec369b6e9748a3741ad79515576fd666.tar.xz spack-9bc27561ec369b6e9748a3741ad79515576fd666.zip | |
Merge pull request #164 from mathstuf/matplotlib-optional-deps
Matplotlib optional deps
| -rw-r--r-- | var/spack/packages/paraview/package.py | 6 | ||||
| -rw-r--r-- | var/spack/packages/py-matplotlib/package.py | 13 | ||||
| -rw-r--r-- | var/spack/packages/py-pyside/package.py | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/var/spack/packages/paraview/package.py b/var/spack/packages/paraview/package.py index a0ff812ca2..8c860bf65b 100644 --- a/var/spack/packages/paraview/package.py +++ b/var/spack/packages/paraview/package.py @@ -7,8 +7,6 @@ class Paraview(Package): version('4.4.0', 'fa1569857dd680ebb4d7ff89c2227378', url='http://www.paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz') variant('python', default=False, description='Enable Python support') - variant('matplotlib', default=False, description='Enable Matplotlib support') - variant('numpy', default=False, description='Enable NumPy support') variant('tcl', default=False, description='Enable TCL support') @@ -18,8 +16,8 @@ class Paraview(Package): variant('qt', default=False, description='Enable Qt support') depends_on('python', when='+python') - depends_on('py-numpy', when='+python+numpy') - depends_on('py-matplotlib', when='+python+matplotlib') + depends_on('py-numpy', when='+python') + depends_on('py-matplotlib', when='+python') depends_on('tcl', when='+tcl') depends_on('mpi', when='+mpi') depends_on('qt', when='+qt') diff --git a/var/spack/packages/py-matplotlib/package.py b/var/spack/packages/py-matplotlib/package.py index e7ce3dfd24..a5fee39d42 100644 --- a/var/spack/packages/py-matplotlib/package.py +++ b/var/spack/packages/py-matplotlib/package.py @@ -9,10 +9,13 @@ class PyMatplotlib(Package): version('1.4.2', '7d22efb6cce475025733c50487bd8898') version('1.4.3', '86af2e3e3c61849ac7576a6f5ca44267') + variant('gui', default=False, description='Enable GUI') + variant('ipython', default=False, description='Enable ipython support') + extends('python', ignore=r'bin/nosetests.*$') - depends_on('py-pyside') - depends_on('py-ipython') + depends_on('py-pyside', when='+gui') + depends_on('py-ipython', when='+ipython') depends_on('py-pyparsing') depends_on('py-six') depends_on('py-dateutil') @@ -20,10 +23,10 @@ class PyMatplotlib(Package): depends_on('py-nose') depends_on('py-numpy') - depends_on('qt') + depends_on('qt', when='+gui') depends_on('bzip2') - depends_on('tcl') - depends_on('tk') + depends_on('tcl', when='+gui') + depends_on('tk', when='+gui') depends_on('qhull') def install(self, spec, prefix): diff --git a/var/spack/packages/py-pyside/package.py b/var/spack/packages/py-pyside/package.py index bb5da44d02..ffa433e18e 100644 --- a/var/spack/packages/py-pyside/package.py +++ b/var/spack/packages/py-pyside/package.py @@ -2,7 +2,7 @@ from spack import * import os class PyPyside(Package): - """array processing for numbers, strings, records, and objects.""" + """Python bindings for Qt.""" homepage = "https://pypi.python.org/pypi/pyside" url = "https://pypi.python.org/packages/source/P/PySide/PySide-1.2.2.tar.gz" |