From 13cceb78698eb80923b6abcc0994fa75aab5bcb2 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sat, 22 Mar 2014 20:35:34 +0100
Subject: [PATCH] Depend on PIL, if installed, or fall-back to Pillow otherwise
---
setup.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index 7afc0cc..517ca21 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,15 @@ include_dirs = [package_dir]
packages = ['bob-io >= 1.2.2']
version = '2.0.0a0'
+# Check if python-imaging means pil or pillow
+pil_or_pillow = []
+try:
+ import pkg_resources
+ pkg_resources.require('pil')
+ pil_or_pillow.append('pil')
+except pkg_resources.DistributionNotFound as e:
+ pil_or_pillow.append('pillow')
+
setup(
name='xbob.io',
@@ -33,8 +42,7 @@ setup(
install_requires=[
'setuptools',
'xbob.blitz',
- 'pillow',
- ],
+ ] + pil_or_pillow,
namespace_packages=[
"xbob",
--
GitLab