From 561f210e796cde772ce05abf5969b5ac16858be8 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Wed, 20 Feb 2019 09:53:39 +0100
Subject: [PATCH] Fixed Travis.

---
 .travis.yml                     | 43 +++++++++++++++------------------
 tests/constraints/flask-1.0.txt |  1 +
 tests/requirements.txt          |  2 +-
 tox.ini                         | 14 +++++------
 4 files changed, 28 insertions(+), 32 deletions(-)
 create mode 100644 tests/constraints/flask-1.0.txt

diff --git a/.travis.yml b/.travis.yml
index 9bef009..8000742 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,26 @@
+services:
+  - redis-server
+dist: xenial
+sudo: false
 language: python
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
-- '3.7'
-services:
-  - redis-server
-dist: xenial
-sudo: false
 cache: pip
-jobs:
-  include:
-
-    - stage: test
-      install: pip install tox-travis
-      script: tox -v
-      after_success: bash <(curl -s https://codecov.io/bash)
-
-    - stage: deploy
-      script: skip
-      deploy:
-        provider: pypi
-        user: jezdez
-        distributions: sdist bdist_wheel
-        password:
-          secure: JQf1o3a16K4roD9gLSi6CpxvErU28NFWLXiCffNZpk1tsFWnieAuxZKYzjFcfhmUvcp+qYWEBHsGw2Xej0jXI+b5y3RMH5gahuxehtiR2F/csgdjnzSQlMAsKDDeN9lXVqijcFhSutFtliDxDQ/J7xqDRF97IJPW0Ggh2jZkaM4BN80IZJmmCRqoaW3juIYWCRPRZSmJhhAOLh7P0f9PuzBc0y5pYBSNvbyRHlcb8xU8/Ya19T4G9JFpH3RmG3/5BdAVQlqlVNAhGLL0TAU1pMkgN+dc9vriJsTtBUoRf9jjeOk6ujX+d3PdFBf1lHwKe8zjsyIiMaObY3pF4vnnVoJ2iUp3oGYHVF6GKsoMMhfhPxeWqgx27Nb8G86KKGwXlA/DJyZJqTaaRo7Fj1zNFtw6A0yAbpjjKchiqivCF0LHwKupsEmA6MMWEucdlLp5Yxgwuqj3uP4zkLXXWTei05+VhbqR6lygccZCmLWuDSTiS7S4F3iWl4gZ3MYZhzz8IJbkNqLg+6yiG1PAwi36UJd0ez+cn+gFKiujUOBWEn4UPuGYGqFZHmeBVENAgcpAHIIhCQe3xadX5bcMPq80O9mDMK4uR4E2xhRmsVFAThMSR5Ne+PCX1Zj62AoJ4snDEVViWtxdCY1hYrggfnD67YwZCuYLSHJoLb+VMO3BoVA=
-        on:
-          tags: true
-          repo: mozilla-services/python-dockerflow
+install:
+- pip install tox-travis
+script: tox -v
+after_success:
+- bash <(curl -s https://codecov.io/bash)
+deploy:
+  provider: pypi
+  user: jezdez
+  distributions: sdist bdist_wheel
+  password:
+    secure: JQf1o3a16K4roD9gLSi6CpxvErU28NFWLXiCffNZpk1tsFWnieAuxZKYzjFcfhmUvcp+qYWEBHsGw2Xej0jXI+b5y3RMH5gahuxehtiR2F/csgdjnzSQlMAsKDDeN9lXVqijcFhSutFtliDxDQ/J7xqDRF97IJPW0Ggh2jZkaM4BN80IZJmmCRqoaW3juIYWCRPRZSmJhhAOLh7P0f9PuzBc0y5pYBSNvbyRHlcb8xU8/Ya19T4G9JFpH3RmG3/5BdAVQlqlVNAhGLL0TAU1pMkgN+dc9vriJsTtBUoRf9jjeOk6ujX+d3PdFBf1lHwKe8zjsyIiMaObY3pF4vnnVoJ2iUp3oGYHVF6GKsoMMhfhPxeWqgx27Nb8G86KKGwXlA/DJyZJqTaaRo7Fj1zNFtw6A0yAbpjjKchiqivCF0LHwKupsEmA6MMWEucdlLp5Yxgwuqj3uP4zkLXXWTei05+VhbqR6lygccZCmLWuDSTiS7S4F3iWl4gZ3MYZhzz8IJbkNqLg+6yiG1PAwi36UJd0ez+cn+gFKiujUOBWEn4UPuGYGqFZHmeBVENAgcpAHIIhCQe3xadX5bcMPq80O9mDMK4uR4E2xhRmsVFAThMSR5Ne+PCX1Zj62AoJ4snDEVViWtxdCY1hYrggfnD67YwZCuYLSHJoLb+VMO3BoVA=
+  on:
+    tags: true
+    repo: mozilla-services/python-dockerflow
+    python: '3.5'
diff --git a/tests/constraints/flask-1.0.txt b/tests/constraints/flask-1.0.txt
new file mode 100644
index 0000000..22247ca
--- /dev/null
+++ b/tests/constraints/flask-1.0.txt
@@ -0,0 +1 @@
+Flask<2.0
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 57840c1..c837c3b 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -7,7 +7,7 @@ pytest-django
 pytest-mock
 pytest-pythonpath
 mock
-redis
+redis<3.2.0
 django-redis
 fakeredis
 jsonschema
diff --git a/tox.ini b/tox.ini
index 038708b..ca450ed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,15 +2,14 @@
 usedevelop = True
 minversion = 1.8
 envlist =
-    lint,
+    py36-lint,
+    py36-dj{18,19,110,111,20}-docs,
     # the version matrix according to the Django docs:
     # https://docs.djangoproject.com/en/2.0/faq/install/#what-python-version-can-i-use-with-django
-    docs-py35-dj{18,19,110,111,20},
-    tests-py{27,34,35}-dj18,
-    tests-py{27,34,35}-dj{19,110},
-    tests-py{27,34,35,36}-dj111,
-    tests-py{34,35,36}-dj20,
-    tests-py{27,34,35,36}-fl{011,012}
+    py{27,34,35}-dj{18,19,110}-tests,
+    py{27,34,35,36}-dj111-tests,
+    py{34,35,36}-dj20-tests,
+    py{27,34,35,36}-fl{011,012,10}-tests,
 
 [testenv]
 basepython =
@@ -30,6 +29,7 @@ deps =
     dj111: -ctests/constraints/django-1.11.txt
     fl011: -ctests/constraints/flask-0.11.txt
     fl012: -ctests/constraints/flask-0.12.txt
+    fl10: -ctests/constraints/flask-1.0.txt
 commands =
     python --version
     tests: pytest {posargs:tests}