Pin the version of Pillow so we can support JPEG-compressed TIFFs, track breaking changes (loris-imageserver#407)

* transforms_t.py: add a test that uses a JPEG-compressed TIFF

* requirements.txt: use pip-tools to compile pinned dependencies

* requirements.txt: also use pip-compile for pins

* And actually pin the version of Pillow

* setup.py: use the requirements.txt to determined installed deps

Author: alexwlchan

requirements.in

@@ -0,0 +1,14 @@
+werkzeug >= 0.11.4
+
+# We put an upper bound on the version of Pillow so we can cope with
+# JPEG-compressed TIFFs.
+#
+# See https://github.com/loris-imageserver/loris/issues/405
+pillow >= 2.4.0, <5.0
+
+configobj >= 4.7.2,<=5.0.0
+requests >= 2.12.0
+netaddr >= 0.7.19
+pyjwt >= 1.5.2
+cryptography >= 2.0.3
+attrs >= 17.3.0

requirements.txt

@@ -1,8 +1,25 @@
-werkzeug >= 0.11.4
-pillow >= 2.4.0
-configobj >= 4.7.2,<=5.0.0
-requests >= 2.12.0
-netaddr >= 0.7.19
-pyjwt >= 1.5.2
-cryptography >= 2.0.3
-attrs >= 17.3.0
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file requirements.txt requirements.in
+#
+asn1crypto==0.24.0        # via cryptography
+attrs==17.4.0
+certifi==2018.1.18        # via requests
+cffi==1.11.5              # via cryptography
+chardet==3.0.4            # via requests
+configobj==5.0.0
+cryptography==2.1.4
+enum34==1.1.6             # via cryptography
+idna==2.6                 # via cryptography, requests
+ipaddress==1.0.19         # via cryptography
+netaddr==0.7.19
+olefile==0.45.1           # via pillow
+pillow==4.3.0
+pycparser==2.18           # via cffi
+pyjwt==1.5.3
+requests==2.18.4
+six==1.11.0               # via cryptography
+urllib3==1.22             # via requests
+werkzeug==0.14.1

requirements_test.in

@@ -0,0 +1,7 @@
+-r requirements.txt
+coverage==4.4.1
+hypothesis >= 3.11.6
+pytest-cov==2.5.1
+pytest==3.1.3
+responses == 0.3.0
+flake8

requirements_test.txt

@@ -1,7 +1,39 @@
--r requirements.txt
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file requirements_test.txt requirements_test.in
+#
+asn1crypto==0.24.0
+attrs==17.4.0
+certifi==2018.1.18
+cffi==1.11.5
+chardet==3.0.4
+configobj==5.0.0
+configparser==3.5.0       # via flake8
 coverage==4.4.1
-hypothesis >= 3.11.6
+cryptography==2.1.4
+enum34==1.1.6
+flake8==3.5.0
+funcsigs==1.0.2           # via mock
+hypothesis==3.46.1
+idna==2.6
+ipaddress==1.0.19
+mccabe==0.6.1             # via flake8
+mock==2.0.0               # via responses
+netaddr==0.7.19
+olefile==0.45.1
+pbr==3.1.1                # via mock
+pillow==4.3.0
+py==1.5.2                 # via pytest
+pycodestyle==2.3.1        # via flake8
+pycparser==2.18
+pyflakes==1.6.0           # via flake8
+pyjwt==1.5.3
 pytest-cov==2.5.1
 pytest==3.1.3
-responses == 0.3.0
-flake8
+requests==2.18.4
+responses==0.3.0
+six==1.11.0
+urllib3==1.22
+werkzeug==0.14.1

setup.py

@@ -11,6 +11,9 @@
 import shutil
 import stat
 
+from pip.download import PipSession
+from pip.req import parse_requirements
+
 VERSION = loris.__version__
 
 EX_NOUSER = 67
@@ -55,13 +58,10 @@
 GROUP_DEFAULT = 'loris'
 GROUP_HELP = 'Group that will own the application and has permission to write to caches. [Default: %s]' % (USER_DEFAULT,)
 
-DEPENDENCIES = [
-    # (package, version, module)
-    ('werkzeug', '>=0.8.3', 'werkzeug'),
-    ('pillow', '>=2.4.0', 'PIL'),
-    ('configobj', '>=4.7.2,<=5.0.0', 'configobj'),
-    ('requests', '>=2.12.0', 'requests'),
-]
+
+def local_file(name):
+    return os.path.relpath(os.path.join(os.path.dirname(__file__), name))
+
 
 class LorisInstallCommand(install):
     description = 'Installs Loris image server'
@@ -214,15 +214,15 @@ def __update_and_deploy_config(self):
         config.filename = config_file_target
         config.write()
 
-install_requires = []
-for d in DEPENDENCIES:
-    try:
-        __import__(d[2], fromlist=[''])
-    except ImportError:
-        install_requires.append(''.join(d[0:2]))
+
+install_requires = parse_requirements(
+    local_file('requirements.txt'), session=PipSession()
+)
+
 
 def _read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return open(local_file(fname)).read()
+
 
 setup(
     cmdclass={ 'install' : LorisInstallCommand },

tests/img/ycbcr-jpeg.tiff

@@ -305,3 +305,12 @@ def test_convert_to_gray_with_no_alpha_is_mode_L(self):
         request_path = '/%s/full/full/0/gray.jpg' % self.test_jpeg_id
         image = self.request_image_from_client(request_path)
         assert image.mode == 'L'
+
+    def test_jpeg_encoded_tif_can_be_retrieved(self):
+        # This checks an issue with Pillow where attempting to load
+        # JPEG-compressed TIFFs.  The test file is taken from the test case
+        # described in https://github.com/python-pillow/Pillow/issues/2926.
+        #
+        # See https://github.com/loris-imageserver/loris/issues/405
+        request_path = '/ycbcr-jpeg.tiff/full/full/0/default.jpg'
+        image = self.request_image_from_client(request_path)