diff --git a/setup.py b/setup.py index c69163d9ad31fd8a40532475f2aed66affa53048..face83b4c94e1b93ad0d9620c8e2259a16486a0d 100755 --- a/setup.py +++ b/setup.py @@ -57,6 +57,7 @@ def build_qt(): 'all', 'PYUIC=%s%s' % (pyuic4, ' WIN32=1' if sys.platform == 'win32' else '')]) + def install_weboob(): scripts = set(os.listdir('scripts')) packages = set(find_packages(exclude=['modules'])) @@ -109,7 +110,6 @@ def install_weboob(): ('share/icons/hicolor/64x64/apps', glob.glob('icons/*')), ]) - # Do not put PyQt, it does not work properly. requirements = [ 'lxml', @@ -124,10 +124,11 @@ def install_weboob(): except ImportError: requirements.append('Pillow') else: - if 'PILcompat' not in Image.__file__: - requirements.append('PIL') - else: + # detect Pillow-only feature, or weird Debian stuff + if hasattr(Image, 'alpha_composite') or 'PILcompat' in Image.__file__: requirements.append('Pillow') + else: + requirements.append('PIL') if sys.version_info[0] > 2: print >>sys.stderr, 'Python 3 is not supported.' @@ -168,6 +169,7 @@ def install_weboob(): install_requires=requirements, ) + class Options(object): hildon = False qt = False