Allow lint failures for now; use py35 for lint and coverage.

This commit is contained in:
Andrei Fokau 2017-10-28 13:38:16 +00:00
parent 84f8f6e013
commit d72ed4619b
No known key found for this signature in database
GPG Key ID: F2BC8AF1CE23A98E
2 changed files with 19 additions and 18 deletions

View File

@ -4,11 +4,12 @@ language: python
cache: pip cache: pip
# Tox cannot install pythons, so we set 3.5 as default, use 3.4 already # Tox cannot install pythons, so we set 3.5 as default, use 3.4 already
# available in container and then include 3.6 in matrix. # available in container, and then include 3.6 in matrix.
python: python:
- 3.5 - 3.5
env: env:
matrix:
- TOXENV=py34 - TOXENV=py34
- TOXENV=py35 - TOXENV=py35
@ -16,10 +17,10 @@ matrix:
include: include:
- python: 3.6 - python: 3.6
env: TOXENV=py36 env: TOXENV=py36
- python: 3.4 # i.e. skip installing 3.5 - env: TOXENV=coverage
env: TOXENV=lint - env: TOXENV=lint
- python: 3.4 allow_failures:
env: TOXENV=coverage34 - env: TOXENV=lint
install: install:
- pip install tox - pip install tox

22
tox.ini
View File

@ -12,16 +12,7 @@ commands =
deps = coverage deps = coverage
[testenv:coverage] [testenv:coverage]
basepython = python3.4 basepython = python3.5
skip_install = true
commands =
coverage combine
coverage report
deps =
coverage
[testenv:coverage34]
basepython = python3.4
install_command = install_command =
pip install {opts} {packages} pip install {opts} {packages}
ignore_errors = True ignore_errors = True
@ -34,8 +25,17 @@ commands =
deps = deps =
coverage coverage
[testenv:combine_coverage]
basepython = python3.5
skip_install = true
commands =
coverage combine
coverage report
deps =
coverage
[testenv:lint] [testenv:lint]
basepython = python3.4 basepython = python3.5
skip_install = true skip_install = true
commands = commands =
flake8 flake8