From 0ffb15dd54b9d4663b3109c45bb07ae8b3020779 Mon Sep 17 00:00:00 2001 From: Andris Raugulis Date: Sun, 26 Mar 2017 06:47:31 +0300 Subject: [PATCH] Pylint and flake8 is not supported on Python 2.6. --- .travis.yml | 13 +++++++------ tox.ini | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e07e44..b5ef195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,16 +33,17 @@ matrix: install: - pip install --upgrade tox coveralls codecov script: - - if [ -z "${TOXENV##*py3*}" ]; then + - | + if [ -z "${TOXENV##*py3*}" ]; then if [ -z "${TOXENV##*pypy3*}" ]; then - _pydir=$(dirname $(which python)); - ln -s -- "${_pydir}/python" "${_pydir}/pypy3"; - export TOXENV=${TOXENV}-test,${TOXENV}-lint; + _pydir=$(dirname $(which python)) + ln -s -- "${_pydir}/python" "${_pydir}/pypy3" + export TOXENV=${TOXENV}-test,${TOXENV}-lint else - export TOXENV=${TOXENV}-test,${TOXENV}-type,${TOXENV}-lint; + export TOXENV=${TOXENV}-test,${TOXENV}-type,${TOXENV}-lint fi else - export TOXENV=${TOXENV}-test,${TOXENV}-lint; + export TOXENV=${TOXENV}-test,${TOXENV}-lint fi - tox -e $TOXENV,cov after_success: diff --git a/tox.ini b/tox.ini index 9119720..19c2274 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,7 @@ [tox] envlist = - py{26,27,py,py3}-{test,pylint,flake8,vulture} + py26-{test,vulture} + py{27,py,py3}-{test,pylint,flake8,vulture} py{33,34,35,36,37}-{test,mypy,pylint,flake8,vulture} cov skipsdist = true @@ -12,8 +13,8 @@ deps = test,cov: {[testenv:cov]deps} test,py{33,34,35,36,37}-{type,mypy}: colorama==0.3.7 py{33,34,35,36,37}-{type,mypy}: {[testenv:mypy]deps} - lint,pylint: {[testenv:pylint]deps} - lint,flake8: {[testenv:flake8]deps} + py{27,py,py3,33,34,35,36,37}-{lint,pylint}: {[testenv:pylint]deps} + py{27,py,py3,33,34,35,36,37}-{lint,flake8}: {[testenv:flake8]deps} lint,vulture: {[testenv:vulture]deps} setenv = SSHAUDIT = {toxinidir}/ssh-audit.py @@ -25,8 +26,8 @@ commands = test: coverage report --show-missing test: - coverage html -d {toxinidir}/html/coverage.{envname} py{33,34,35,36,37}-{type,mypy}: {[testenv:mypy]commands} - lint,pylint: {[testenv:pylint]commands} - lint,flake8: {[testenv:flake8]commands} + py{27,py,py3,33,34,35,36,37}-{lint,pylint}: {[testenv:pylint]commands} + py{27,py,py3,33,34,35,36,37}-{lint,flake8}: {[testenv:flake8]commands} lint,vulture: {[testenv:vulture]commands} ignore_outcome = type: true