Skip to content

Commit

Permalink
Update setup.py to always require pillow and not import PIL
Browse files Browse the repository at this point in the history
It seems that in older versions of setuptools (or maybe even easy_install) that importing certain libraries in setup.py causes an infinite loop and eats up memory until it gets killed by the kernel.
  • Loading branch information
djhoese committed Mar 24, 2016
1 parent 2a9d1e8 commit a73297f
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
BASE_PATH = os.path.sep.join(os.path.dirname(
os.path.realpath(__file__)).split(os.path.sep))

requires = ['numpy >=1.4.1', 'pyresample', 'trollsift', 'trollimage', 'pykdtree', 'six']
requires = ['numpy >=1.4.1', 'pillow', 'pyresample', 'trollsift', 'trollimage', 'pykdtree', 'six']

if sys.version < '2.7':
requires.append('ordereddict')
Expand All @@ -51,12 +51,6 @@
if sys.version < '3.0':
test_requires.append('mock')

try:
from PIL import Image
except ImportError:
requires.append("pillow")


def _config_data_files(base_dirs, extensions=(".cfg",)):
"""Find all subdirectory configuration files
Expand Down

0 comments on commit a73297f

Please sign in to comment.