From a9b4bd8d8c7ab9168995d9cbdbaf3b016ce2b7bc Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 4 Oct 2020 19:25:50 -0300
Subject: [PATCH] Test older Pillow versions

---
 .github/workflows/python-tests.yml | 17 ++++++++++++++---
 tox.ini                            | 16 ++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index f5f7997..bdc654e 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -1,6 +1,15 @@
 name: Run unit tests
 
 on: [push, pull_request]
+# on:
+#   pull_request:
+#   push:
+#     branches:
+#     - master
+#     tags:
+#   schedule:
+#     # Run everyday at 03:53 UTC
+#     - cron: 53 3 * * *
 
 jobs:
   build:
@@ -8,6 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        fail-fast: false
         python-version: [3.6, 3.7, 3.8, pypy3]
 
     steps:
@@ -21,9 +31,10 @@ jobs:
         sudo apt install ffmpeg
         ffmpeg -version
     - name: Install Tox
-      run: pip install tox
+      run: python -m pip install tox tox-gh-actions
     - name: Run Tox
-      # Run tox using the version of Python in `PATH`
-      run: tox -e py
+      run: tox
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.xml
diff --git a/tox.ini b/tox.ini
index 57777b3..e51d355 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,22 @@
 [tox]
-envlist = py{36,37,38}
+envlist = py{36,37,38}{,-pillow6,-pillow7},pypy3
 skip_missing_interpreters = True
 
-[travis]
+[gh-actions]
 python =
-    3.6: py36
-    3.7: py37
-    3.8: py38
+    3.6: py36-pillow6
+    3.7: py37-pillow7
+    3.8: py38, check
+    pypy3: pypy3
 
 [testenv]
+deps =
+    pillow6: Pillow==6.0.0
+    pillow7: Pillow==7.0.0
 extras =
     all
     tests
-commands = pytest --cov sigal --cov-report term-missing tests/
+commands = pytest --cov sigal --cov-report term --cov-report=xml tests/
 
 [testenv:check]
 deps =