diff options
| author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:34:53 -0600 |
|---|---|---|
| committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:34:53 -0600 |
| commit | b8444aa518b819c640269b262eb1069cc4d552e0 (patch) | |
| tree | c88d373fab8e09dae255ded8d37c6ad385960792 /var/spack/repos/builtin/packages/py-matplotlib/package.py | |
| parent | a09bebcaea24a90072d0650760434be11fcf3f29 (diff) | |
| parent | e389afedaaa1e617aa3d1cb161535f6105e1b574 (diff) | |
| download | spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.gz spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.bz2 spack-b8444aa518b819c640269b262eb1069cc4d552e0.tar.xz spack-b8444aa518b819c640269b262eb1069cc4d552e0.zip | |
Merge remote-tracking branch 'upstream/develop' into package-opencv
* upstream/develop: (126 commits)
Fix indent/flake8 error.
openexr : Add new package
Set environment variables
Added gnu packages datamash, parallel, and screen
added package as argument to setup_platform_environment
ilmbase : Add new IlmBase package
Documented linker default
fixed flake errors
removed commented-out code
Set default link type to dynamic on cray. Includes hooks for platform-based environment changes
fixed flake errors
fixed flake errors
Improved cray_xc detection bug fix
Improved cray_xc detection
remove FIXMEs
Ensure that per-4.4.1 NetCDF doesn't use HDF5 1.10
Re-ignore licenses directory
Add "default" configuration scope.
Draft CDO
Make frontend OS on Cray machines a proper linux distro.
...
Diffstat (limited to 'var/spack/repos/builtin/packages/py-matplotlib/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-matplotlib/package.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 14f9716ae6..b5eb8a53c4 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -38,19 +38,20 @@ class PyMatplotlib(Package): extends('python', ignore=r'bin/nosetests.*$|bin/pbr$') - depends_on('py-pyside', when='+gui') - depends_on('py-ipython', when='+ipython') - depends_on('py-pyparsing') - depends_on('py-six') - depends_on('py-dateutil') - depends_on('py-pytz') - depends_on('py-nose') - depends_on('py-numpy') - depends_on('py-mock') - depends_on('py-pbr') - depends_on('py-funcsigs') + depends_on('py-setuptools', type='build') + depends_on('py-pyside', when='+gui', type=nolink) + depends_on('py-ipython', when='+ipython', type=nolink) + depends_on('py-pyparsing', type=nolink) + depends_on('py-six', type=nolink) + depends_on('py-dateutil', type=nolink) + depends_on('py-pytz', type=nolink) + depends_on('py-nose', type=nolink) + depends_on('py-numpy', type=nolink) + depends_on('py-mock', type=nolink) + depends_on('py-pbr', type=nolink) + depends_on('py-funcsigs', type=nolink) - depends_on('pkg-config') + depends_on('pkg-config', type='build') depends_on('freetype') depends_on('qt', when='+gui') depends_on('bzip2') |