Skip to content

Commit 9217b80

Browse files
committed
Update CI to test against latest pytest release
1 parent b151e56 commit 9217b80

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ env:
2121
- TOXENV=py-pytest31
2222
- TOXENV=py-pytest32
2323
- TOXENV=py-pytest33
24-
- TOXENV=py-pytest36
25-
- TOXENV=py-pytest38
24+
- TOXENV=py-pytestlatest
2625

2726
install: pip install tox setuptools_scm
2827
script: tox

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ environment:
55
- TOXENV: "py34-pytest33"
66
- TOXENV: "py35-pytest33"
77
- TOXENV: "py36-pytest33"
8-
- TOXENV: "py36-pytest36"
9-
- TOXENV: "py36-pytest38"
8+
- TOXENV: "py36-pytestlatest"
109
- TOXENV: "py27-pytest33-pexpect"
1110
- TOXENV: "py36-pytest33-pexpect"
1211

tox.ini

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# if you change the envlist, please update .travis.yml file as well
33
envlist=
44
linting
5-
py{27,34,35,36}-pytest{30,31,32,33,36,38}
5+
py{27,34,35,36}-pytest{30,31,32,33,latest}
66
py{27,36}-pytest36-pexpect
77
py{27,36}-pytest{master,features}
88

@@ -18,17 +18,14 @@ deps =
1818
pytest31: pytest~=3.1.0
1919
pytest32: pytest~=3.2.0
2020
pytest33: pytest~=3.3.0
21-
pytest36: pytest~=3.6.0
22-
pytest38: pytest~=3.8.0
21+
pytestlatest: pytest
2322
pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
2423
pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
2524
pexpect: pexpect
2625
filelock
2726
platform=
2827
pexpect: linux|darwin
2928
commands=
30-
# always clean to avoid code unmarshal mismatch on old python/pytest
31-
py.cleanup -aq
3229
pytest {posargs}
3330

3431
[testenv:linting]

0 commit comments

Comments
 (0)