From 8550018e9fc778e27a225c774d91064782d361a7 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 21 Aug 2017 13:34:37 +0200
Subject: [PATCH 1/2] tests/Travis: test against latest pytest 3

---
 .travis.yml | 42 +++++++++++++++++++++---------------------
 tox.ini     | 20 ++++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc742cdb3..6cc05b2df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,60 +7,60 @@ matrix:
   include:
 
     - python: 3.6
-      env: TOXENV=py36-pytest30-djangomaster-postgres
+      env: TOXENV=py36-pytest3-djangomaster-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest30-django1.11-postgres
+      env: TOXENV=py36-pytest3-django1.11-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest30-django1.10-postgres
+      env: TOXENV=py36-pytest3-django1.10-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest30-django1.9-postgres
+      env: TOXENV=py36-pytest3-django1.9-postgres
     - python: 3.6
-      env: TOXENV=py36-pytest30-django1.8-postgres
+      env: TOXENV=py36-pytest3-django1.8-postgres
     - python: 3.6
       env: TOXENV=py36-checkqa
 
     - python: 3.5
-      env: TOXENV=py35-pytest30-django1.11-postgres
+      env: TOXENV=py35-pytest3-django1.11-postgres
 
     - python: 3.4
-      env: TOXENV=py34-pytest30-django1.11-postgres
+      env: TOXENV=py34-pytest3-django1.11-postgres
 
     - python: 3.3
-      env: TOXENV=py34-pytest30-django1.8-postgres
+      env: TOXENV=py34-pytest3-django1.8-postgres
 
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.11-mysql_innodb
+      env: TOXENV=py27-pytest3-django1.11-mysql_innodb
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.11-mysql_myisam
+      env: TOXENV=py27-pytest3-django1.11-mysql_myisam
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.11-postgres
+      env: TOXENV=py27-pytest3-django1.11-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.10-postgres
+      env: TOXENV=py27-pytest3-django1.10-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.9-postgres
+      env: TOXENV=py27-pytest3-django1.9-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.8-postgres
+      env: TOXENV=py27-pytest3-django1.8-postgres
     - python: 2.7
-      env: TOXENV=py27-pytest30-django1.7-postgres
+      env: TOXENV=py27-pytest3-django1.7-postgres
     - python: 2.7
       env: TOXENV=py27-checkqa
 
     - python: pypy
-      env: TOXENV=pypy-pytest30-django1.11-sqlite_file
+      env: TOXENV=pypy-pytest3-django1.11-sqlite_file
 
     - python: pypy3
-      env: TOXENV=pypy3-pytest30-django1.8-sqlite
+      env: TOXENV=pypy3-pytest3-django1.8-sqlite
     - python: pypy3
-      env: TOXENV=pypy3-pytest30-django1.10-sqlite_file
+      env: TOXENV=pypy3-pytest3-django1.10-sqlite_file
 
   allow_failures:
-    - env: TOXENV=py36-pytest30-djangomaster-postgres
+    - env: TOXENV=py36-pytest3-djangomaster-postgres
 
     # Temporary.
     # https://github.com/pytest-dev/pytest-django/pull/445
     # https://github.com/pytest-dev/pytest-django/issues/448
-    - env: TOXENV=pypy3-pytest30-django1.8-sqlite
-    - env: TOXENV=pypy3-pytest30-django1.10-sqlite_file
+    - env: TOXENV=pypy3-pytest3-django1.8-sqlite
+    - env: TOXENV=pypy3-pytest3-django1.10-sqlite_file
 
 cache:
   directories:
diff --git a/tox.ini b/tox.ini
index 2d5d2baa8..f52390b84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 envlist =
-    - py{35,36}-pytest30-django{master,1.11,1.10,1.9,1.8}-postgres
-    - py34-pytest30-django{1.11,1.10}-postgres
-    - py33-pytest30-django1.8-postgres
-    - py27-pytest30-django{1.11,1.10}-{mysql_innodb,mysql_myisam,postgres}
-    - py27-pytest30-django{1.11,1.10,1.9,1.8,1.7}-postgres
-    - pypy3-pytest30-django1.8-{sqlite,sqlite_file}
-    - pypy3-pytest29-django1.8-sqlite_file
-    - pypy-pytest30-django1.10-sqlite_file
+    - py{35,36}-pytest3-django{master,1.11,1.10,1.9,1.8}-postgres
+    - py34-pytest3-django{1.11,1.10}-postgres
+    - py33-pytest3-django1.8-postgres
+    - py27-pytest3-django{1.11,1.10}-{mysql_innodb,mysql_myisam,postgres}
+    - py27-pytest3-django{1.11,1.10,1.9,1.8,1.7}-postgres
+    - pypy3-pytest3-django1.8-{sqlite,sqlite_file}
+    - pypy3-pytest2-django1.8-sqlite_file
+    - pypy-pytest3-django1.10-sqlite_file
     - py{35,py27}-checkqa
 
 [testenv]
@@ -29,8 +29,8 @@ deps =
 
     postgres: psycopg2
 
-    pytest29: pytest>=2.9,<3.0
-    pytest30: pytest>=3.0,<3.1.11a1
+    pytest2: pytest>=2.9,<3.0
+    pytest3: pytest>=3.0,<4.0
 
 setenv =
      PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}

From f6dea89558aa5fdc5fab68cf545e1be13c14fd32 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 21 Aug 2017 13:42:33 +0200
Subject: [PATCH 2/2] tox: test against latest Django 1.11

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index f52390b84..6930bfd52 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ deps =
     checkqa: flake8
 
     djangomaster: https://github.com/django/django/archive/master.tar.gz
-    django1.11: Django==1.11b1
+    django1.11: Django>=1.11,<1.12
     django1.10: Django>=1.10,<1.11
     django1.9: Django>=1.9,<1.10
     django1.8: Django>=1.8,<1.9