zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Browse Source 
Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py
This commit is contained in:
Todd Gamblin
2015-12-25 16:35:55 -08:00
parent 34401cf0c3 28d61f0d7f
commit c65fd3a289
303 changed files with 4025 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/py-basemap/package.py
View File

@@ -11,8 +11,8 @@ class PyBasemap(Package):
extends('python')
depends_on('py-setuptools')
depends_on('py-numpy')
depends_on('py-matplotlib')
depends_on('py-pil')
depends_on('py-matplotlib+gui')
depends_on('py-pillow')
depends_on("geos")
def install(self, spec, prefix):