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

Merge branch 'workaround/yt-py-pillow' into yt-dev-working-branch

Browse Source
This commit is contained in:
Matthew Krafczyk
2017-01-17 15:32:30 -06:00
parent 65be1a93f1 f10c3ca55e
commit 81424dce5c
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,11 +53,8 @@ class PyYt(Package):
variant("astropy", default=True, description="enable astropy support") variant("astropy", default=True, description="enable astropy support")
variant("h5py", default=True, description="enable h5py support") variant("h5py", default=True, description="enable h5py support")
variant("scipy", default=True, description="enable scipy support") variant("scipy", default=True, description="enable scipy support")
<<<<<<< HEAD
variant("devmode", default=False, description="enable development mode") variant("devmode", default=False, description="enable development mode")
=======
variant("rockstar", default=False, description="enable rockstar support") variant("rockstar", default=False, description="enable rockstar support")
>>>>>>> update/yt-rockstar
extends("python") extends("python")
@@ -71,6 +68,7 @@ class PyYt(Package):
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
depends_on("py-sympy", type=('build', 'run')) depends_on("py-sympy", type=('build', 'run'))
depends_on("rockstar@yt", type=('build', 'run'), when="+rockstar") depends_on("rockstar@yt", type=('build', 'run'), when="+rockstar")
depends_on("py-pillow", type=('build', 'run'))
depends_on("python @2.7:2.999,3.4:") depends_on("python @2.7:2.999,3.4:")
def install(self, spec, prefix): def install(self, spec, prefix):