summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Fischer <rpf2116@columbia.edu>2016-09-28 16:51:41 -0400
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-28 16:51:41 -0400
commit3352889d73ef247f75a8a2d76e19e55b956de968 (patch)
treef248cbb4eeffda8809fd3a2d397efa771512a136
parent40407925011d3dc10cdbca6f755aff5952b27e76 (diff)
downloadspack-3352889d73ef247f75a8a2d76e19e55b956de968.tar.gz
spack-3352889d73ef247f75a8a2d76e19e55b956de968.tar.bz2
spack-3352889d73ef247f75a8a2d76e19e55b956de968.tar.xz
spack-3352889d73ef247f75a8a2d76e19e55b956de968.zip
py-pil: Protect against building with Python3. (#1868)
* py-pil: Does not build with Python3. * Set py-pillow to be the default pil provider * Update package.py * Change to comments requested by adamjstewart * Remove version constraint from extends(), avoid a Spack bug.
-rw-r--r--etc/spack/defaults/packages.yaml1
-rw-r--r--var/spack/repos/builtin/packages/py-pil/package.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml
index 83f9eb7ece..a6b361d908 100644
--- a/etc/spack/defaults/packages.yaml
+++ b/etc/spack/defaults/packages.yaml
@@ -19,3 +19,4 @@ packages:
mpi: [openmpi, mpich]
blas: [openblas]
lapack: [openblas]
+ pil: [py-pillow]
diff --git a/var/spack/repos/builtin/packages/py-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py
index 2b3cce26d3..29a86d1e85 100644
--- a/var/spack/repos/builtin/packages/py-pil/package.py
+++ b/var/spack/repos/builtin/packages/py-pil/package.py
@@ -37,7 +37,10 @@ class PyPil(Package):
provides('pil')
+ # py-pil currently only works with Python2.
+ # If you are using Python 3, try using py-pillow instead.
extends('python')
+ depends_on('python@1.5.2:2.8')
def install(self, spec, prefix):
python('setup.py', 'install', '--prefix=%s' % prefix)