Merge 1b127fa into aadfc7e

.travis.yml

@@ -1,42 +1,43 @@
+language: python
 sudo: false
 cache: pip
 
+python:
+  - "3.5"
+
 addons:
   postgresql: "9.6"
   apt:
     packages:
       - expect-dev  # provides unbuffer utility
       - python-lxml # because pip installation is slow
-      - postgresql-9.6-postgis-2.3 postgis # because travis doesn't know which one to install
-
-language: python
-
-before_script:
-  - createdb openerp_test
-  - psql -U postgres -d openerp_test -c "create extension postgis"
-  - psql -U postgres -d openerp_test -c "create extension postgis_topology"
-
-python:
-  - "3.5"
+      - postgis postgresql-9.6-postgis-2.3 # travis doesn't know which one to install
+      - postgresql-9.6-postgis-2.3-scripts # pre-installed on travis but required for runbot
 
 env:
-  matrix:
-  - VERSION="11.0" LINT_CHECK="1"
-  - VERSION="11.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
-  - VERSION="11.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0" DOCS="1"
   global:
-    secure: "HLfds+sQG4JcM53.5b/sTemGvBlVNdfGc4XvJ+py2rx25F4BWojpbOYx44nSiUjBO9U6Eo5kwiK0mWEXoPGg6trQcbiur9kgHrV3+hydlUUKe2/P/mnoP2JAxtu0JBSLxNcG40FdIwEE3Sd0w/ocmxMOp3RmOOVacAY48eWYeh8="
+    - VERSION="11.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
+    - secure: "HLfds+sQG4JcM52D7b/sTemGvBlVNdfGc4XvJ+py2rx25F4BWojpbOYx44nSiUjBO9U6Eo5kwiK0mWEXoPGg6trQcbiur9kgHrV3+hydlUUKe2/P/mnoP2JAxtu0JBSLxNcG40FdIwEE3Sd0w/ocmxMOp3RmOOVacAY48eWYeh8="
+
+  matrix:
+  - LINT_CHECK="1"
+  - TESTS="1" ODOO_REPO="odoo/odoo" LINT_CHECK="0" MAKEPOT="1"
+  - TESTS="1" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
 
 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 geojson Shapely sphinx sphinx_bootstrap_theme sphinx-intl odoo-sphinx-autodoc
 
+before_script:
+  - psql -U postgres -d postgres -c "create extension postgis"
+  - psql -U postgres -d postgres -c "create extension postgis_topology"
+
 script:
   - if [ -z "$DOCS" ] ; then travis_run_tests; fi
   - if [ -n "$DOCS" ] ; then ./.travis_build_doc; fi
 
 after_success:
-  - if [ -z "$DOCS" ] ; then coveralls; fi
+  - if [ -z "$DOCS" ] ; then travis_after_tests_success; fi
   - if [ -n "$DOCS" ] ; then ./.travis_push_doc; fi