Merge pull request #162 from palfrey/new-travis

Upgrade Travis config, and only run mysql/psql in relevant configs

.travis.yml

@@ -1,17 +1,19 @@
-sudo: false
+dist: bionic
+os: linux
 language: python
 python:
   - "2.7"
-  - "3.4"
+  - "3.7"
 env:
   - DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_sqllite'
   - DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_postgres'
   - DJANGO=1.11.* DJANGO_SETTINGS_MODULE='settings_mysql'
   - DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_sqllite'
   - DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_postgres'
   - DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_mysql'
-addons:
-  - postgresql: "9.3"
+services:
+  - mysql
+  - postgresql
 install:
   - pip install -q Django==$DJANGO
   - pip install coveralls
@@ -21,10 +23,10 @@ script:
 after_success:
   - coveralls
 before_script:
-  - mysql -e 'create database travis_test;'
-  - psql -c 'create database travis_test;' -U postgres
+  - if [ "$DJANGO_SETTINGS_MODULE" = "settings_mysql" ]; then mysql -e 'create database travis_test;' ; fi
+  - if [ "$DJANGO_SETTINGS_MODULE" = "settings_postgres" ]; then psql -c 'create database travis_test;' -U postgres ; fi
   - flake8 . --config=flake8
-matrix:
+jobs:
   exclude:
     - python: "2.7"
       env: DJANGO=2.0.* DJANGO_SETTINGS_MODULE='settings_sqllite'