diff --git a/.travis.yml b/.travis.yml index 124c52d..6716bfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,44 @@ language: python -sudo: false -cache: pip +cache: + directories: + - $HOME/.cache/pip + - $HOME/.cache/pre-commit python: - - "3.5" + - "3.6" addons: postgresql: "9.6" apt: packages: - - expect-dev # provides unbuffer utility + - expect-dev # provides unbuffer utility + +stages: + - linting + - test + +jobs: + include: + - stage: linting + name: "pre-commit" + before_install: + install: pip install pre-commit + script: pre-commit run --all --show-diff-on-failure --verbose --color always + after_success: + - stage: test + env: + - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" + - stage: test + env: + - TESTS="1" ODOO_REPO="OCA/OCB" env: global: - - VERSION="12.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" - - matrix: - - LINT_CHECK="1" - - TESTS="1" ODOO_REPO="OCA/OCB" - - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" + - VERSION="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" install: - - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools + - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git + ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly diff --git a/amazon_integration/views/amazon_menuitems.xml b/amazon_integration/views/amazon_menuitems.xml index 1c35d66..6ce6bd9 100644 --- a/amazon_integration/views/amazon_menuitems.xml +++ b/amazon_integration/views/amazon_menuitems.xml @@ -14,7 +14,6 @@ amazon.marketplace kanban,form {'search_default_group_country_id':1} - form