Merge remote-tracking branch 'upstream/8.0' into 8.0

.coveragerc

@@ -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:

.travis.yml

@@ -4,7 +4,9 @@ python:
   - "2.7"
 
 env:
-  - VERSION="8.0"
+  - VERSION="8.0" LINT_CHECK="1"
+  - 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
@@ -14,12 +16,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_flake8
-  - travis_run_tests ${VERSION}
+  - travis_run_tests
 
 after_success:
   coveralls

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')
 

partner_auto_salesman/__init__.py

@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import res_partner
+from . import res_partner

partner_firstname/tests/__init__.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-import test_partner_firstname
+from . import test_partner_firstname
 
 checks = [
     test_partner_firstname

res_partner_affiliate/__init__.py

@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import res_partner
+from . import res_partner