From 449d4eac0abc76208d67fc09de7d87193f1824d6 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 10 Apr 2015 21:59:10 +0300 Subject: [PATCH] CI: fix tox and travis --- .travis.yml | 5 ++--- tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d2bba1..bf602da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,9 @@ install: - pip install coveralls pep8 mock script: - - pep8 amodem/ scripts/ tests/ amodem-cli + - pep8 amodem/ scripts/ tests/ - echo "Hello World!" | amodem-cli send -vv -l- -o- | amodem-cli recv -vv -l- -i- - - cd tests - - coverage run --source=amodem -m py.test -vvs + - coverage run --source=amodem --omit="*/__main__.py" -m py.test -vvs tests/ after_success: - coverage report diff --git a/tox.ini b/tox.ini index c1c9c1f..e7d8f32 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ deps= pylint six commands= - pep8 amodem/ scripts/ tests/ amodem-cli + pep8 amodem/ scripts/ tests/ pylint --extension-pkg-whitelist=numpy --report=no amodem --rcfile .pylintrc - coverage run --source amodem/ -m py.test -v tests/ + coverage run --source amodem/ --omit="*/__main__.py" -m py.test -v tests/ coverage report