Incorporate changes from PR #120

This commit is contained in:
Jiri Kucera 2019-09-02 14:27:10 +02:00
parent 561ce8f5df
commit 047469b14d
2 changed files with 18 additions and 4 deletions

10
tox.ini
View file

@ -115,6 +115,7 @@ commands =
[testenv:pylint]
envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:2.7}
basepython = python2.7
passenv = RUN_PYLINT_*
setenv =
{[base]setenv}
deps =
@ -134,13 +135,14 @@ commands =
flake8 --statistics {posargs} .
[testenv:coveralls]
envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:2.7}
basepython = python2.7
envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:coveralls}
passenv = TRAVIS TRAVIS_*
whitelist_externals = bash
deps =
coveralls
changedir = {[base]changedir}
commands =
bash -c 'cd ..; bash .travis/fix-coverage.sh; cd -'
coveralls
# LSR_MOLECULE_DEPS may contain aditional Molecule dependencies. For example,
@ -235,8 +237,8 @@ max-line-length = 88
[travis]
python =
2.6: py26,extra
2.7: py27,coveralls,flake8,pylint,extra
3.5: molecule_lint,molecule_syntax,molecule_test,extra
2.7: py27,flake8,pylint,extra
3.5: coveralls,molecule_lint,molecule_syntax,molecule_test,extra
3.6: py36,black,extra
3.7: py37,extra
3.8: py38,extra