From 10c1d7779175c80816a5ad531e0d9e728780241a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 28 Oct 2017 01:49:49 +0200
Subject: [PATCH 1/2] Travis/tox: only test pytest 3

---
 .travis.yml | 36 ++++++++++++++++++------------------
 tox.ini     | 14 ++++++--------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c001c0a3b..f0118aeed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,52 +6,52 @@ matrix:
   fast_finish: true
   include:
     - python: 3.6
-      env: TOXENV=py36-pytest3-djmaster-postgres
+      env: TOXENV=py36-djmaster-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest3-dj20-postgres
+      env: TOXENV=py36-dj20-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest3-dj111-postgres
+      env: TOXENV=py36-dj111-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest3-dj110-postgres
+      env: TOXENV=py36-dj110-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest3-dj19-postgres
+      env: TOXENV=py36-dj19-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest3-dj18-postgres
+      env: TOXENV=py36-dj18-postgres
     - python: 3.6
       env: TOXENV=py36-checkqa
 
     - python: 3.5
-      env: TOXENV=py35-pytest3-dj111-postgres
+      env: TOXENV=py35-dj111-postgres
 
     - python: 3.4
-      env: TOXENV=py34-pytest3-dj111-postgres
+      env: TOXENV=py34-dj111-postgres
 
     - python: 3.3
-      env: TOXENV=py34-pytest3-dj18-postgres
+      env: TOXENV=py34-dj18-postgres
 
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj111-mysql_innodb
+      env: TOXENV=py27-dj111-mysql_innodb
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj111-mysql_myisam
+      env: TOXENV=py27-dj111-mysql_myisam
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj111-postgres
+      env: TOXENV=py27-dj111-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj110-postgres
+      env: TOXENV=py27-dj110-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj19-postgres
+      env: TOXENV=py27-dj19-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest3-dj18-postgres
+      env: TOXENV=py27-dj18-postgres
     - python: 2.7
       env: TOXENV=py27-checkqa
 
     - python: pypy
-      env: TOXENV=pypy-pytest3-dj111-sqlite_file
+      env: TOXENV=pypy-dj111-sqlite_file
 
     - python: pypy3
-      env: TOXENV=pypy3-pytest3-dj110-sqlite_file
+      env: TOXENV=pypy3-dj110-sqlite_file
 
   allow_failures:
-    - env: TOXENV=py36-pytest3-djmaster-postgres
+    - env: TOXENV=py36-djmaster-postgres
 
 cache:
   directories:
diff --git a/tox.ini b/tox.ini
index 485f85693..1e97fca39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,15 @@
 [tox]
 envlist =
-    - py{35,36}-pytest3-dj{20,111,110,19,18}-postgres
-    - py34-pytest3-dj{20,111,110}-postgres
-    - py33-pytest3-dj18-postgres
-    - py27-pytest3-dj{111,110}-{mysql_innodb,mysql_myisam,postgres}
-    - py27-pytest3-dj{111,110,19,18}-postgres
+    - py{35,36}-dj{20,111,110,19,18}-postgres
+    - py34-dj{20,111,110}-postgres
+    - py33-dj18-postgres
+    - py27-dj{111,110}-{mysql_innodb,mysql_myisam,postgres}
+    - py27-dj{111,110,19,18}-postgres
     - py{36,py27}-checkqa
 
 [testenv]
 deps =
+    pytest>=3.0,<4.0
     django-configurations==2.0
     pytest-xdist==1.15
     {env:_PYTESTDJANGO_TOX_EXTRA_DEPS:}
@@ -26,9 +27,6 @@ deps =
     mysql_innodb: mysql-python==1.2.5
 
     postgres: psycopg2
-
-    pytest2: pytest>=2.9,<3.0
-    pytest3: pytest>=3.0,<4.0
 setenv =
      PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}
 

From ba991ca6aeb080cea25496f042c7a4d2b0f0efd8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sat, 28 Oct 2017 01:52:30 +0200
Subject: [PATCH 2/2] Travis: trim down build matrix, drop py3.3

---
 .travis.yml | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0118aeed..9d81bb494 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,34 +11,19 @@ matrix:
       env: TOXENV=py36-dj20-postgres
     - python: 3.6
       env: TOXENV=py36-dj111-postgres
-    - python: 3.6
-      env: TOXENV=py36-dj110-postgres
-    - python: 3.6
-      env: TOXENV=py36-dj19-postgres
-    - python: 3.6
-      env: TOXENV=py36-dj18-postgres
     - python: 3.6
       env: TOXENV=py36-checkqa
 
     - python: 3.5
-      env: TOXENV=py35-dj111-postgres
+      env: TOXENV=py35-dj110-postgres
 
     - python: 3.4
-      env: TOXENV=py34-dj111-postgres
-
-    - python: 3.3
-      env: TOXENV=py34-dj18-postgres
+      env: TOXENV=py34-dj19-postgres
 
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_innodb
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_myisam
-    - python: 2.7
-      env: TOXENV=py27-dj111-postgres
-    - python: 2.7
-      env: TOXENV=py27-dj110-postgres
-    - python: 2.7
-      env: TOXENV=py27-dj19-postgres
     - python: 2.7
       env: TOXENV=py27-dj18-postgres
     - python: 2.7
@@ -48,7 +33,7 @@ matrix:
       env: TOXENV=pypy-dj111-sqlite_file
 
     - python: pypy3
-      env: TOXENV=pypy3-dj110-sqlite_file
+      env: TOXENV=pypy3-dj110-sqlite
 
   allow_failures:
     - env: TOXENV=py36-djmaster-postgres