From 1a5bd4b35966b784bff08a04f007ae59bef74a3f Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Sep 2018 22:58:02 +0200
Subject: [PATCH] Try tox-travis and add Python 3.7

---
 .travis.yml      | 26 +++++++++++++-------------
 requirements.txt |  3 ---
 tox.ini          | 20 +++++++++-----------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0e5f29..6b902e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,19 @@ language: python
 cache: pip
 sudo: false
 
-env:
-  global:
-    - PILLOW="Pillow"
+python:
+  - 3.6
+  - 3.5
 
 matrix:
   include:
-    - python: 3.5
-      env: PILLOW="Pillow==4.0.0"
+    - python: 3.7
+      dist: xenial
+      sudo: true
     - python: 3.6
-
+      env: TOXENV=check
+  allow_failures:
+    - env: TOXENV=check
 
 addons:
   apt:
@@ -26,19 +29,16 @@ addons:
       - libjpeg8-dev
       - zlib1g-dev
 
-install:
-    - pip install -U pip setuptools wheel
-    - pip install -q $PILLOW
-    - pip install pytest pytest-cov codecov feedgenerator zopfli brotli
-    - pip install .
+install: pip install -U tox-travis
 
 before_script:
   ffmpeg --help
 
-script: py.test -sv --cov sigal --cov-report term-missing tests/
+script: tox
 
 after_success:
-    codecov
+  - pip install codecov
+  - codecov
 
 notifications:
     irc: "chat.freenode.net#sigal"
diff --git a/requirements.txt b/requirements.txt
index b32739f..b037f6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-alabaster
 blinker
 boto
 brotli
@@ -11,6 +10,4 @@ Pillow
 pilkit
 pytest
 pytest-cov
-Sphinx
-twine
 zopfli
diff --git a/tox.ini b/tox.ini
index 3f53fbb..2465886 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,23 +1,21 @@
 [tox]
-envlist = py{35,36},report,check
+envlist = py{35,36,37},check
 skip_missing_interpreters = True
 
+[travis]
+python =
+    3.7: py37
+    3.6: py36
+    3.5: py35
+
 [testenv]
-commands = pytest --cov sigal --cov-report term-missing
 deps =
+    -r {toxinidir}/requirements.txt
     pytest
     pytest-cov
-
-[testenv:report]
-basepython = python3.6
-commands =
-    coverage combine
-    coverage report
-usedevelop = true
-deps = coverage
+commands = pytest --cov sigal --cov-report term-missing tests/
 
 [testenv:check]
-basepython = python3.6
 deps =
     docutils
     check-manifest