diff options
| author | Matthew Krafczyk <krafczyk.matthew@gmail.com> | 2017-01-17 15:32:30 -0600 |
|---|---|---|
| committer | Matthew Krafczyk <krafczyk.matthew@gmail.com> | 2017-01-17 15:32:30 -0600 |
| commit | 81424dce5cac5be2bae78e3b737ba7b8c8bc1ea3 (patch) | |
| tree | f2a2cb93227ec7fb96af1f4c9858b70513e09d60 /var | |
| parent | 65be1a93f1974da102c476d22c035a1073ce804c (diff) | |
| parent | f10c3ca55e02dd84943f539277e3ec39a5c5f20a (diff) | |
| download | spack-NCSA-v1.tar.gz spack-NCSA-v1.tar.bz2 spack-NCSA-v1.tar.xz spack-NCSA-v1.zip | |
Merge branch 'workaround/yt-py-pillow' into yt-dev-working-branchNCSA-v1
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-yt/package.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 547024fe43..1cdc7dc187 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -53,11 +53,8 @@ class PyYt(Package): variant("astropy", default=True, description="enable astropy support") variant("h5py", default=True, description="enable h5py support") variant("scipy", default=True, description="enable scipy support") -<<<<<<< HEAD variant("devmode", default=False, description="enable development mode") -======= variant("rockstar", default=False, description="enable rockstar support") ->>>>>>> update/yt-rockstar extends("python") @@ -71,6 +68,7 @@ class PyYt(Package): depends_on("py-setuptools", type="build") depends_on("py-sympy", type=('build', 'run')) 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:") def install(self, spec, prefix): |