Merge pull request #164 from mathstuf/matplotlib-optional-deps

Matplotlib optional deps

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')

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):

var/spack/packages/py-pyside/package.py

@@ -2,7 +2,7 @@
 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"