use sane travis config add newer pytest versions and remove tox-travis
This commit is contained in:
10
.travis.yml
10
.travis.yml
@@ -6,13 +6,17 @@ python:
|
||||
- '3.4'
|
||||
- '3.5'
|
||||
- '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:
|
||||
include:
|
||||
# note: please use "tox --listenvs" to populate the build matrix
|
||||
- python: "3.5"
|
||||
- python: "3.6"
|
||||
env: TOXENV=flakes
|
||||
- python: "3.5"
|
||||
- python: "3.6"
|
||||
env: TOXENV=readme
|
||||
|
||||
script: tox
|
||||
|
||||
6
tox.ini
6
tox.ini
@@ -1,8 +1,8 @@
|
||||
[tox]
|
||||
# if you change the envlist, please update .travis.yml file as well
|
||||
envlist=
|
||||
py{26,27,34,35,36}-pytest{30}
|
||||
py{27,35}-pytest{30}-pexpect
|
||||
py{26,27,34,35,36}-pytest{30,31,32}
|
||||
py{27,36}-pytest{30,31,32}-pexpect
|
||||
flakes
|
||||
readme
|
||||
|
||||
@@ -15,6 +15,8 @@ deps =
|
||||
# to avoid .eggs
|
||||
setuptools_scm
|
||||
pytest30: pytest~=3.0.5
|
||||
pytest31: pytest~=3.1.0
|
||||
pytest32: pytest~=3.2.0
|
||||
pexpect: pexpect
|
||||
platform=
|
||||
pexpect: linux|darwin
|
||||
|
||||
Reference in New Issue
Block a user