diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index b060d18e3..000000000 --- a/.coveragerc +++ /dev/null @@ -1,17 +0,0 @@ -# Config file .coveragerc - -[report] -include = - */manufacture/* - -omit = - */tests/* - *__init__.py - -# Regexes for lines to exclude from consideration -exclude_lines = - # Have to re-enable the standard pragma - pragma: no cover - - # Don't complain about null context checking - if context is None: diff --git a/.travis.yml b/.travis.yml index 83c4a04e9..4d7bceabf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ python: - "2.7" env: - - VERSION="7.0" + - VERSION="7.0" ODOO_REPO="odoo/odoo" + - VERSION="7.0" ODOO_REPO="OCA/OCB" + - VERSION="7.0" UNIT_TEST="1" virtualenv: system_site_packages: true @@ -12,12 +14,10 @@ virtualenv: install: - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - travis_install_nightly ${VERSION} - - $HOME/maintainer-quality-tools/travis/travis_install_nightly ${VERSION} + - travis_install_nightly script: - - travis_run_flake8 - - travis_run_tests ${VERSION} + - travis_run_tests after_success: coveralls