diff --git a/tests/sample/sigal.conf.py b/tests/sample/sigal.conf.py index 1f79df5..c2dd3a3 100644 --- a/tests/sample/sigal.conf.py +++ b/tests/sample/sigal.conf.py @@ -5,7 +5,6 @@ thumb_suffix = ".tn" keep_orig = True thumb_video_delay = 5 # img_format = 'jpeg' -copy_exif_data = True links = [ ("Example link", "http://example.org"), diff --git a/tests/test_image.py b/tests/test_image.py index 94fb425..37679b6 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -1,7 +1,9 @@ import os from unittest.mock import patch +import PIL import pytest +from packaging.version import Version from PIL import Image as PILImage from sigal import init_logging @@ -280,6 +282,9 @@ def test_exif_copy(tmpdir): assert not simple +@pytest.mark.skipif( + Version(PIL.__version__) < Version('8.0'), reason='fails with Pillow < 8.0' +) def test_exif_gps(tmpdir): """Test reading out correct geo tags""" diff --git a/tox.ini b/tox.ini index 34a32cd..de6f766 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,19 @@ [tox] -envlist = py{37,38,39}-pillow{71,-latest},pypy3,check +envlist = py{37,38,39}-pillow{72,80,-latest},pypy3,check skip_missing_interpreters = true isolated_build = true [gh-actions] python = - 3.7: py37-pillow71 - 3.8: py38-pillow-latest, check + 3.7: py37-pillow72 + 3.8: py38-pillow80, check 3.9: py39-pillow-latest pypy3: pypy3 [testenv] deps = - pillow70: Pillow==7.0.0 - pillow71: Pillow==7.1.0 + pillow80: Pillow==8.0.1 + pillow72: Pillow==7.2.0 extras = all tests