From beb92732edac3d03347ea725746aa79ebf32250d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 27 Jul 2018 17:20:50 -0300 Subject: [PATCH] Include pytest 3.6 into the build matrix --- .travis.yml | 1 + appveyor.yml | 5 +++-- tox.ini | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e8d987..f9123c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ env: - TOXENV=py-pytest31 - TOXENV=py-pytest32 - TOXENV=py-pytest33 +- TOXENV=py-pytest36 install: pip install tox setuptools_scm script: tox diff --git a/appveyor.yml b/appveyor.yml index 2aa53fa..96721d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,18 +5,19 @@ environment: - TOXENV: "py34-pytest33" - TOXENV: "py35-pytest33" - TOXENV: "py36-pytest33" + - TOXENV: "py36-pytest36" - TOXENV: "py27-pytest33-pexpect" - TOXENV: "py36-pytest33-pexpect" - TOXENV: "flakes" - TOXENV: "readme" install: - - C:\Python35\python -m pip install -U tox setuptools_scm pip + - C:\Python36\python -m pip install -U tox setuptools_scm pip build: false # Not a C# project, build stuff at the test step instead. test_script: - - C:\Python35\python -m tox + - C:\Python36\python -m tox # We don't deploy anything on tags with AppVeyor, we use Travis instead, so we # might as well save resources diff --git a/tox.ini b/tox.ini index 8bda1c2..9399513 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{27,34,35,36}-pytest{30,31,32,33} - py{27,36}-pytest{30,31,32,33}-pexpect + py{27,34,35,36}-pytest{30,31,32,33,36} + py{27,36}-pytest{30,36}-pexpect py{27,36}-pytest{master,features} flakes readme @@ -19,6 +19,7 @@ deps = pytest31: pytest~=3.1.0 pytest32: pytest~=3.2.0 pytest33: pytest~=3.3.0 + pytest36: pytest~=3.6.0 pytestmaster: git+https://github.com/pytest-dev/pytest.git@master pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features pexpect: pexpect