From 03a3f0792615f32377ba1137a3227397c07c79d7 Mon Sep 17 00:00:00 2001
From: Matthias Kestenholz <mk@feinheit.ch>
Date: Sun, 22 Nov 2020 16:21:11 +0100
Subject: [PATCH] Add newer versions of Django and Python to the CI matrix

I find explicitly stating combinations easier than managing exclusions.
---
 .travis.yml | 70 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68b17c0..414493c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,57 @@
 sudo: false
 language: python
 python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
+  - 3.8
+services:
+  - postgresql
 env:
   - DB=sqlite DJANGO_PACKAGE=Django~=1.11
   - DB=postgres DJANGO_PACKAGE=Django~=1.11
-  - DB=sqlite DJANGO_PACKAGE=Django~=2.0
-  - DB=postgres DJANGO_PACKAGE=Django~=2.0
-  - DB=postgres DJANGO_PACKAGE='--pre Django>2.0,<2.2'
-  - DB=sqlite DJANGO_PACKAGE='--pre Django>2.0,<2.2'
+  - DB=sqlite DJANGO_PACKAGE=Django~=2.2
+  - DB=postgres DJANGO_PACKAGE=Django~=2.2
+  - DB=sqlite DJANGO_PACKAGE=Django~=3.0
+  - DB=postgres DJANGO_PACKAGE=Django~=3.0
+  - DB=sqlite DJANGO_PACKAGE=Django~=3.1
+  - DB=postgres DJANGO_PACKAGE=Django~=3.1
 matrix:
-  exclude:
-    - python: "2.7"
-      env: DB=sqlite DJANGO_PACKAGE=Django~=2.0
-    - python: "2.7"
-      env: DB=postgres DJANGO_PACKAGE=Django~=2.0
-    - python: "2.7"
-      env: DB=postgres DJANGO_PACKAGE='--pre Django>2.0,<2.2'
-    - python: "2.7"
-      env: DB=sqlite DJANGO_PACKAGE='--pre Django>2.0,<2.2'
-    - python: "3.4"
-      env: DB=postgres DJANGO_PACKAGE='--pre Django>2.0,<2.2'
-    - python: "3.4"
-      env: DB=sqlite DJANGO_PACKAGE='--pre Django>2.0,<2.2'
-install: 'pip install $DJANGO_PACKAGE && pip install .'
+  fast_finish: true
+  include:
+    - python: 3.8
+      env: REQ="Django>=3.1,<3.2"
+    - python: 3.8
+      env: REQ="Django>=3.1,<3.2" DB=postgres
+    - python: 3.7
+      env: REQ="Django>=3.1,<3.2"
+    - python: 3.6
+      env: REQ="Django>=3.1,<3.2"
+    - python: 3.8
+      env: REQ="Django>=3.0,<3.1"
+    - python: 3.7
+      env: REQ="Django>=3.0,<3.1"
+    - python: 3.6
+      env: REQ="Django>=3.0,<3.1"
+    - python: 3.7
+      env: REQ="Django>=2.2,<3.0"
+    - python: 3.7
+      env: REQ="Django>=2.2,<3.0" DB=postgres
+    - python: 3.6
+      env: REQ="Django>=2.2,<3.0"
+    - python: 3.5
+      env: REQ="Django>=2.2,<3.0"
+    - python: 3.7
+      env: REQ="Django>=2.1,<2.2"
+    - python: 3.7
+      env: REQ="Django>=2.0,<2.1"
+    - python: 3.7
+      env: REQ="Django>=1.11,<2.0"
+    - python: 3.6
+      env: REQ="Django>=1.11,<2.0"
+    - python: 3.5
+      env: REQ="Django>=1.11,<2.0"
+    - python: 2.7
+      env: REQ="Django>=1.11,<2.0"
+install: 'pip install $REQ && pip install .'
 script: make test SETTINGS=tests.travis_settings
 before_script:
   - psql -c 'create database test_ool;' -U postgres
-  - pip install psycopg2-binary 
+  - pip install psycopg2-binary