Travis: use Ubuntu Xenial (#694)

* tests: mysql: use default_storage_engine

* Travis: update pypy/pypy3 versions

Ref: https://travis-ci.community/t/pypy-2-7-on-xenial/889/4

Author: blueyed

.travis.yml

@@ -1,55 +1,60 @@
-sudo: false
 language: python
-dist: trusty
+dist: xenial
 
 jobs:
   fast_finish: true
   include:
     - stage: baseline
       python: 3.6
       env: TOXENV=py36-dj20-postgres-coverage
+      services:
+        - postgresql
     - python: 3.6
       env: TOXENV=py36-dj111-sqlite-coverage
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_innodb-coverage
+      services:
+        - mysql
     - python: 3.6
       env: TOXENV=checkqa,docs
 
     - stage: test
-      # py37 is not available in trusty dist, and requires sudo=true with xenial.
       python: 3.7
       env: TOXENV=py37-dj21-sqlite-coverage
-      dist: xenial
-      sudo: true
-
     - python: 3.7
       env: TOXENV=py37-dj22-sqlite-coverage
-      dist: xenial
-      sudo: true
 
     - python: 3.6
       env: TOXENV=py36-djmaster-sqlite-coverage
 
     - python: 3.5
       env: TOXENV=py35-dj110-postgres-coverage
+      services:
+        - postgresql
 
     - python: 3.4
       env: TOXENV=py34-dj19-sqlite_file-coverage
 
     - python: 2.7
       env: TOXENV=py27-dj111-mysql_myisam-coverage
+      services:
+        - mysql
     - python: 2.7
       env: TOXENV=py27-dj18-postgres-coverage
+      services:
+        - postgresql
 
     # pypy/pypy3: not included with coverage reports (much slower then).
-    - python: pypy
+    - python: pypy2.7-6.0
       env: TOXENV=pypy-dj111-sqlite_file
-    - python: pypy3
+    - python: pypy3.5-6.0
       env: TOXENV=pypy3-dj110-sqlite
 
     - stage: test_release
       python: 3.6
       env: TOXENV=py36-dj20-postgres
+      services:
+        - postgresql
 
     - stage: release
       script: skip

pytest_django_test/settings_mysql_innodb.py

@@ -1,11 +1,11 @@
-from .settings_base import *  # noqa
+from .settings_base import *  # noqa: F403
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
-        "NAME": "pytest_django" + db_suffix,  # noqa
+        "NAME": "pytest_django" + db_suffix,  # noqa: F405
         "HOST": "localhost",
         "USER": "root",
-        "OPTIONS": {"init_command": "SET storage_engine=InnoDB"},
+        "OPTIONS": {"init_command": "SET default_storage_engine=InnoDB"},
     }
 }

pytest_django_test/settings_mysql_myisam.py

@@ -1,11 +1,11 @@
-from pytest_django_test.settings_base import *  # noqa
+from pytest_django_test.settings_base import *  # noqa: F403
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.mysql",
-        "NAME": "pytest_django" + db_suffix,  # noqa
+        "NAME": "pytest_django" + db_suffix,  # noqa: F405
         "HOST": "localhost",
         "USER": "root",
-        "OPTIONS": {"init_command": "SET storage_engine=MyISAM"},
+        "OPTIONS": {"init_command": "SET default_storage_engine=MyISAM"},
     }
 }