From 7182573522235d8cbcefc483b2b1682c4904a716 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:28:59 +0100 Subject: [PATCH 1/7] .coveragerc is now generated automatically during the build --- .coveragerc | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 5ec945b..0000000 --- a/.coveragerc +++ /dev/null @@ -1,15 +0,0 @@ -[report] -include = - */OCA/report-print-send/* - -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: From 48d4aaa59319952770808369934f9aa86fc22b28 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:32:34 +0100 Subject: [PATCH 2/7] Update .travis.yml to the last quality tools --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b3e573..fc91d01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ language: python python: - "2.7" +env: + - VERSION="8.0" ODOO_REPO="odoo/odoo" + - VERSION="8.0" ODOO_REPO="OCA/OCB" + virtualenv: system_site_packages: true @@ -12,16 +16,16 @@ before_install: 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 7.0 + - travis_install_nightly - pip install coveralls flake8 - pip install pycups==1.9.66 - pip install PyPDF2==1.18 - pip install requests - - git clone https://github.com/OCA/reporting-engine -b 7.0 $HOME/reporting-engine + - git clone https://github.com/OCA/reporting-engine -b 8.0 $HOME/reporting-engine script: - travis_run_flake8 - - travis_run_tests 7.0 $HOME/reporting-engine + - travis_run_tests after_success: coveralls From 905a0702ee99fc63c7615f84e1324243fbf8ceec Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:40:18 +0100 Subject: [PATCH 3/7] add UNIT_TEST --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index fc91d01..a2e759c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: env: - VERSION="8.0" ODOO_REPO="odoo/odoo" - VERSION="8.0" ODOO_REPO="OCA/OCB" + - VERSION="8.0" UNIT_TEST="1" virtualenv: system_site_packages: true From 2fd5e42cdcb3bf39bffb419df6877420a427a570 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:41:09 +0100 Subject: [PATCH 4/7] travis_run_flake8 is deprecated --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2e759c..3624f1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ install: - git clone https://github.com/OCA/reporting-engine -b 8.0 $HOME/reporting-engine script: - - travis_run_flake8 - travis_run_tests after_success: From a7ba3ec677d8aac674e5aad4197661d71bb6f561 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:42:24 +0100 Subject: [PATCH 5/7] Use the env variable for the version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3624f1c..5c3563d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - pip install pycups==1.9.66 - pip install PyPDF2==1.18 - pip install requests - - git clone https://github.com/OCA/reporting-engine -b 8.0 $HOME/reporting-engine + - git clone https://github.com/OCA/reporting-engine -b ${VERSION} $HOME/reporting-engine script: - travis_run_tests From cf70d214afe1dc8a8e5760a678b99cd594d15315 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:46:18 +0100 Subject: [PATCH 6/7] Use the same indentation of 2 spaces --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c3563d..71b78f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,21 +11,21 @@ virtualenv: system_site_packages: true before_install: - - sudo apt-get update - - sudo apt-get install libcups2-dev cups + - sudo apt-get update + - sudo apt-get install libcups2-dev cups 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 - - pip install coveralls flake8 - - pip install pycups==1.9.66 - - pip install PyPDF2==1.18 - - pip install requests - - git clone https://github.com/OCA/reporting-engine -b ${VERSION} $HOME/reporting-engine + - 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 + - pip install coveralls flake8 + - pip install pycups==1.9.66 + - pip install PyPDF2==1.18 + - pip install requests + - git clone https://github.com/OCA/reporting-engine -b ${VERSION} $HOME/reporting-engine script: - - travis_run_tests + - travis_run_tests after_success: coveralls From 1560d85e859a83dcbfc20418a5b6064d37a4cd3b Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 4 Nov 2014 10:52:11 +0100 Subject: [PATCH 7/7] Run tests with unit tests only I think we don't need to run tests both separately and altogether --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71b78f2..de539f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,8 @@ python: - "2.7" env: - - VERSION="8.0" ODOO_REPO="odoo/odoo" - - VERSION="8.0" ODOO_REPO="OCA/OCB" - - VERSION="8.0" UNIT_TEST="1" + - VERSION="8.0" ODOO_REPO="odoo/odoo" UNIT_TEST="1" + - VERSION="8.0" ODOO_REPO="OCA/OCB" UNIT_TEST="1" virtualenv: system_site_packages: true