Skip to content

Commit d49e603

Browse files
committed
Add pytest 2.9 and drop pytest 2.4 and 2.5 from build matrix
1 parent 9c7d7c9 commit d49e603

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,21 @@ install: "pip install -U tox setuptools_scm"
88
env:
99
matrix:
1010
# note: please use "tox --listenvs" to populate the build matrix
11-
- TESTENV=py26-pytest24
12-
- TESTENV=py26-pytest25
1311
- TESTENV=py26-pytest26
1412
- TESTENV=py26-pytest27
1513
- TESTENV=py26-pytest28
16-
- TESTENV=py27-pytest24
17-
- TESTENV=py27-pytest25
14+
- TESTENV=py26-pytest29
1815
- TESTENV=py27-pytest26
1916
- TESTENV=py27-pytest27
2017
- TESTENV=py27-pytest28
21-
- TESTENV=py34-pytest24
22-
- TESTENV=py34-pytest25
18+
- TESTENV=py27-pytest29
2319
- TESTENV=py34-pytest26
2420
- TESTENV=py34-pytest27
2521
- TESTENV=py34-pytest28
22+
- TESTENV=py34-pytest29
2623
- TESTENV=py35-pytest27
2724
- TESTENV=py35-pytest28
25+
- TESTENV=py35-pytest29
2826
- TESTENV=py27-pytest28-pexpect
2927
- TESTENV=py35-pytest28-pexpect
3028
- TESTENV=flakes

tox.ini

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
22
# if you change the envlist, please update .travis.yml file as well
33
envlist=
4-
py{26,27,34}-pytest2{4,5,6,7,8}
5-
py35-pytest2{7,8}
4+
py{26,27,34}-pytest2{6,7,8,9}
5+
py35-pytest2{7,8,9}
66
py{27,35}-pytest28-pexpect
77
flakes
88
readme
@@ -14,11 +14,10 @@ passenv = USER USERNAME
1414
deps =
1515
pycmd
1616
setuptools_scm # to avoid .eggs
17-
pytest24: pytest~=2.4.0
18-
pytest25: pytest~=2.5.0
1917
pytest26: pytest~=2.6.1
2018
pytest27: pytest~=2.7.2
21-
pytest28: pytest~=2.8.3
19+
pytest28: pytest~=2.8.7
20+
pytest29: pytest~=2.9.1
2221
pexpect: pexpect
2322
platform=
2423
pexpect: linux|darwin

0 commit comments

Comments
 (0)