Depend on pil

3 files changed, 12 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py
index 41ca3b44fb..1d00edb06d 100644
--- a/var/spack/repos/builtin/packages/openjpeg/package.py
+++ b/var/spack/repos/builtin/packages/openjpeg/package.py
@@ -37,9 +37,9 @@ class Openjpeg(Package):
     homepage = "https://github.com/uclouvain/openjpeg"
     url      = "https://github.com/uclouvain/openjpeg/archive/version.2.1.tar.gz"
 
-    version('2.1'  , '3e1c451c087f8462955426da38aa3b3d')
+    version('2.1',   '3e1c451c087f8462955426da38aa3b3d')
     version('2.0.1', '105876ed43ff7dbb2f90b41b5a43cfa5')
-    version('2.0'  , 'cdf266530fee8af87454f15feb619609')
+    version('2.0',   'cdf266530fee8af87454f15feb619609')
     version('1.5.2', '545f98923430369a6b046ef3632ef95c')
     version('1.5.1', 'd774e4b5a0db5f0f171c4fc0aabfa14e')
 
diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py
index 95d02bce91..13f604bacd 100644
--- a/var/spack/repos/builtin/packages/py-basemap/package.py
+++ b/var/spack/repos/builtin/packages/py-basemap/package.py
@@ -23,10 +23,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
-import os
+
 
 class PyBasemap(Package):
-    """The matplotlib basemap toolkit is a library for plotting 2D data on maps in Python."""
+    """The matplotlib basemap toolkit is a library for plotting
+    2D data on maps in Python."""
+
     homepage = "http://matplotlib.org/basemap/"
     url      = "https://downloads.sourceforge.net/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz"
 
@@ -36,7 +38,7 @@ class PyBasemap(Package):
     depends_on('py-setuptools')
     depends_on('py-numpy')
     depends_on('py-matplotlib+gui')
-    depends_on('py-pillow')
+    depends_on('pil')
     depends_on("geos")
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py
index 0479e9eb0a..4c8fd0942a 100644
--- a/var/spack/repos/builtin/packages/py-scikit-image/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py
@@ -24,8 +24,11 @@
 ##############################################################################
 from spack import *
 
+
 class PyScikitImage(Package):
-    """Image processing algorithms for SciPy, including IO, morphology, filtering, warping, color manipulation, object detection, etc."""
+    """Image processing algorithms for SciPy, including IO, morphology,
+    filtering, warping, color manipulation, object detection, etc."""
+
     homepage = "http://scikit-image.org/"
     url      = "https://pypi.python.org/packages/source/s/scikit-image/scikit-image-0.12.3.tar.gz"
 
@@ -34,7 +37,7 @@ class PyScikitImage(Package):
     extends('python', ignore=r'bin/.*\.py$')
 
     depends_on('py-dask')
-    depends_on('py-pillow')
+    depends_on('pil')
     depends_on('py-networkx')
     depends_on('py-six')
     depends_on('py-scipy')