Skip to content

Commit

Permalink
Merge pull request #65 from yvaucher/8.0-separate-lint
Browse files Browse the repository at this point in the history
Separated Lint tests
  • Loading branch information
tafaRU committed Dec 18, 2014
2 parents c163128 + b25b975 commit 1eb2fb9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 26 deletions.
17 changes: 0 additions & 17 deletions .coveragerc

This file was deleted.

10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion base_partner_merge/base_partner_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
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')

Expand Down
2 changes: 1 addition & 1 deletion partner_auto_salesman/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
#
##############################################################################

import res_partner
from . import res_partner
2 changes: 1 addition & 1 deletion partner_firstname/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#
##############################################################################

import test_partner_firstname
from . import test_partner_firstname

checks = [
test_partner_firstname
Expand Down
2 changes: 1 addition & 1 deletion res_partner_affiliate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
#
##############################################################################

import res_partner
from . import res_partner

0 comments on commit 1eb2fb9

Please sign in to comment.