Skip to content

Commit

Permalink
Merge pull request #196 from slafs/PILfix
Browse files Browse the repository at this point in the history
fix Pillow dependency
  • Loading branch information
rburhum committed Oct 20, 2014
2 parents c620165 + bd5e0d2 commit 1b4a73d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions setup.py
@@ -1,6 +1,10 @@
#!/usr/bin/env python

from distutils.core import setup
try:
from setuptools import setup
except ImportError:
from distutils.core import setup

import pkg_resources
import sys

Expand All @@ -19,10 +23,10 @@ def is_installed(name):
requires = ['ModestMaps >=1.3.0','simplejson', 'Werkzeug']

# Soft dependency on PIL or Pillow
if is_installed('Pillow') or sys.platform == 'win32':
requires.append('Pillow')
else:
if is_installed('PIL'):
requires.append('PIL')
else:
requires.append('Pillow')


setup(name='TileStache',
Expand Down

0 comments on commit 1b4a73d

Please sign in to comment.