From dd3d180fe3161f9a9a450a83d1b30c0186ecf7e1 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 4 May 2016 17:34:45 -0300
Subject: [PATCH] Add pytest 2.9 and drop pytest 2.4 and 2.5 from build matrix

---
 .travis.yml | 10 ++++------
 tox.ini     |  9 ++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f7910e..6acf63a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,23 +8,21 @@ install: "pip install -U tox setuptools_scm"
 env:
   matrix:
   # note: please use "tox --listenvs" to populate the build matrix
-  - TESTENV=py26-pytest24
-  - TESTENV=py26-pytest25
   - TESTENV=py26-pytest26
   - TESTENV=py26-pytest27
   - TESTENV=py26-pytest28
-  - TESTENV=py27-pytest24
-  - TESTENV=py27-pytest25
+  - TESTENV=py26-pytest29
   - TESTENV=py27-pytest26
   - TESTENV=py27-pytest27
   - TESTENV=py27-pytest28
-  - TESTENV=py34-pytest24
-  - TESTENV=py34-pytest25
+  - TESTENV=py27-pytest29
   - TESTENV=py34-pytest26
   - TESTENV=py34-pytest27
   - TESTENV=py34-pytest28
+  - TESTENV=py34-pytest29
   - TESTENV=py35-pytest27
   - TESTENV=py35-pytest28
+  - TESTENV=py35-pytest29
   - TESTENV=py27-pytest28-pexpect
   - TESTENV=py35-pytest28-pexpect
   - TESTENV=flakes
diff --git a/tox.ini b/tox.ini
index 54fb438..4e9273e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{26,27,34}-pytest2{4,5,6,7,8}
-  py35-pytest2{7,8}
+  py{26,27,34}-pytest2{6,7,8,9}
+  py35-pytest2{7,8,9}
   py{27,35}-pytest28-pexpect
   flakes
   readme  
@@ -14,11 +14,10 @@ passenv = USER USERNAME
 deps =
   pycmd
   setuptools_scm # to avoid .eggs
-  pytest24: pytest~=2.4.0
-  pytest25: pytest~=2.5.0
   pytest26: pytest~=2.6.1
   pytest27: pytest~=2.7.2
-  pytest28: pytest~=2.8.3
+  pytest28: pytest~=2.8.7
+  pytest29: pytest~=2.9.1
   pexpect: pexpect
 platform=
   pexpect: linux|darwin