From 9217b80fb19fcbda7e0589301852aa5e13acb98d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Mon, 29 Oct 2018 18:50:39 -0300 Subject: [PATCH] Update CI to test against latest pytest release --- .travis.yml | 3 +-- appveyor.yml | 3 +-- tox.ini | 7 ++----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a5b531..7d693c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,7 @@ env: - TOXENV=py-pytest31 - TOXENV=py-pytest32 - TOXENV=py-pytest33 -- TOXENV=py-pytest36 -- TOXENV=py-pytest38 +- TOXENV=py-pytestlatest install: pip install tox setuptools_scm script: tox diff --git a/appveyor.yml b/appveyor.yml index fef4d06..290ac16 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,8 +5,7 @@ environment: - TOXENV: "py34-pytest33" - TOXENV: "py35-pytest33" - TOXENV: "py36-pytest33" - - TOXENV: "py36-pytest36" - - TOXENV: "py36-pytest38" + - TOXENV: "py36-pytestlatest" - TOXENV: "py27-pytest33-pexpect" - TOXENV: "py36-pytest33-pexpect" diff --git a/tox.ini b/tox.ini index ebafc13..c3ba7b6 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # if you change the envlist, please update .travis.yml file as well envlist= linting - py{27,34,35,36}-pytest{30,31,32,33,36,38} + py{27,34,35,36}-pytest{30,31,32,33,latest} py{27,36}-pytest36-pexpect py{27,36}-pytest{master,features} @@ -18,8 +18,7 @@ deps = pytest31: pytest~=3.1.0 pytest32: pytest~=3.2.0 pytest33: pytest~=3.3.0 - pytest36: pytest~=3.6.0 - pytest38: pytest~=3.8.0 + pytestlatest: pytest pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features pexpect: pexpect @@ -27,8 +26,6 @@ deps = platform= pexpect: linux|darwin commands= - # always clean to avoid code unmarshal mismatch on old python/pytest - py.cleanup -aq pytest {posargs} [testenv:linting]