From a42ed384a0c87df9347c04ca5a25dcdfee24cb1f Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 16 Dec 2014 11:18:52 +0100 Subject: [PATCH 1/6] Separated Lint tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da5809c6b..ff7c0eafe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ python: - "2.7" env: - - VERSION="8.0" + - VERSION="8.0" LINT_CHECK="1" + - VERSION="8.0" LINT_CHECK="0" virtualenv: system_site_packages: true From 88af1537cb40378d2a38a0eb101e34b363de6031 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 16 Dec 2014 14:29:38 +0100 Subject: [PATCH 2/6] Remove deprecated travis_run_pep8 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff7c0eafe..d5c3549c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ install: - $HOME/maintainer-quality-tools/travis/travis_install_nightly ${VERSION} script: - - travis_run_flake8 - travis_run_tests ${VERSION} after_success: From a598f63e430998a89f12c73af2df90a3469c2949 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 16 Dec 2014 18:35:23 +0100 Subject: [PATCH 3/6] Remove .coveragerc --- .coveragerc | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index e4eb3ea53..000000000 --- a/.coveragerc +++ /dev/null @@ -1,17 +0,0 @@ -# Config file .coveragerc - -[report] -include = - */partner-contact/* - -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 7c3af08ce730096528369a6159025bf9f76cd9f4 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 16 Dec 2014 18:36:28 +0100 Subject: [PATCH 4/6] Remove VERSION from args as taken from env --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5c3549c1..5125921b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,10 @@ install: - pip install unicodecsv - 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_tests ${VERSION} + - travis_run_tests after_success: coveralls From 607a51b7f515b42d9194e1001c2517fa1d7de255 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 16 Dec 2014 18:37:45 +0100 Subject: [PATCH 5/6] Tests on both odoo and OCB --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5125921b9..a3bbf4d62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ python: env: - VERSION="8.0" LINT_CHECK="1" - - VERSION="8.0" LINT_CHECK="0" + - VERSION="8.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0" + - VERSION="8.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0" virtualenv: system_site_packages: true From 0f65e66c698e6f46165d4dd5cad152ba2c8267e3 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Thu, 18 Dec 2014 09:34:49 +0100 Subject: [PATCH 6/6] Fix pylint errors --- base_partner_merge/base_partner_merge.py | 2 +- partner_auto_salesman/__init__.py | 2 +- partner_firstname/tests/__init__.py | 2 +- res_partner_affiliate/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base_partner_merge/base_partner_merge.py b/base_partner_merge/base_partner_merge.py index 416430d0b..f3d1055ad 100644 --- a/base_partner_merge/base_partner_merge.py +++ b/base_partner_merge/base_partner_merge.py @@ -20,7 +20,7 @@ from openerp.osv import fields from openerp.osv.orm import browse_record from openerp.tools.translate import _ -pattern = re.compile("&(\w+?);") +pattern = re.compile(r"&(\w+?);") _logger = logging.getLogger('base.partner.merge') diff --git a/partner_auto_salesman/__init__.py b/partner_auto_salesman/__init__.py index baddfb7e4..2db3e2a08 100644 --- a/partner_auto_salesman/__init__.py +++ b/partner_auto_salesman/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import res_partner +from . import res_partner diff --git a/partner_firstname/tests/__init__.py b/partner_firstname/tests/__init__.py index c0902dd38..5c1049505 100644 --- a/partner_firstname/tests/__init__.py +++ b/partner_firstname/tests/__init__.py @@ -28,7 +28,7 @@ # ############################################################################## -import test_partner_firstname +from . import test_partner_firstname checks = [ test_partner_firstname diff --git a/res_partner_affiliate/__init__.py b/res_partner_affiliate/__init__.py index 998876a61..3cd8dd337 100644 --- a/res_partner_affiliate/__init__.py +++ b/res_partner_affiliate/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import res_partner +from . import res_partner