use sane travis config add newer pytest versions and remove tox-travis

This commit is contained in:
Ronny Pfannschmidt
2017-08-09 14:21:19 +02:00
parent d5d630f1b7
commit 0515f59c63
2 changed files with 11 additions and 5 deletions

View File

@@ -6,13 +6,17 @@ python:
- '3.4' - '3.4'
- '3.5' - '3.5'
- '3.6' - '3.6'
install: pip install tox-travis setuptools_scm env:
- TOXENV=py-pytest30
- TOXENV=py-pytest31
- TOXENV=py-pytest32
install: pip install tox setuptools_scm
matrix: matrix:
include: include:
# note: please use "tox --listenvs" to populate the build matrix # note: please use "tox --listenvs" to populate the build matrix
- python: "3.5" - python: "3.6"
env: TOXENV=flakes env: TOXENV=flakes
- python: "3.5" - python: "3.6"
env: TOXENV=readme env: TOXENV=readme
script: tox script: tox

View File

@@ -1,8 +1,8 @@
[tox] [tox]
# if you change the envlist, please update .travis.yml file as well # if you change the envlist, please update .travis.yml file as well
envlist= envlist=
py{26,27,34,35,36}-pytest{30} py{26,27,34,35,36}-pytest{30,31,32}
py{27,35}-pytest{30}-pexpect py{27,36}-pytest{30,31,32}-pexpect
flakes flakes
readme readme
@@ -15,6 +15,8 @@ deps =
# to avoid .eggs # to avoid .eggs
setuptools_scm setuptools_scm
pytest30: pytest~=3.0.5 pytest30: pytest~=3.0.5
pytest31: pytest~=3.1.0
pytest32: pytest~=3.2.0
pexpect: pexpect pexpect: pexpect
platform= platform=
pexpect: linux|darwin pexpect: linux|darwin