CI(Travis): Set default OS to `linux`, dist to `xenial`

[sqlconvert.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b240f97bab00f3881c3c73e850509aab7ea16c4b..a6df1127a340eec0771f34dfa1e26a6aa39aefec 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,6 @@
-# Config file for automatic testing at travis-ci.org
+os: linux
 
-# Only test master and pull requests; skip tags.
-# Other branches can allow themselves.
-branches:
-  only:
-    - master
-
-# Prefer docker containers
-sudo: required
+dist: xenial
 
 language: python
 
@@ -34,7 +27,6 @@ matrix:
   - python: "3.6"
     env: TOXENV=py36
   - python: "3.7"
-    dist: xenial
     env: TOXENV=py37
   - python: "2.7"
     env: TOXENV=py27-postgres
@@ -45,7 +37,6 @@ matrix:
   - python: "3.6"
     env: TOXENV=py36-postgres
   - python: "3.7"
-    dist: xenial
     env: TOXENV=py37-postgres
   - python: "2.7"
     env: TOXENV=py27-sqlite
@@ -56,16 +47,14 @@ matrix:
   - python: "3.6"
     env: TOXENV=py36-sqlite
   - python: "3.7"
-    dist: xenial
     env: TOXENV=py37-sqlite
   - python: "2.7"
     env: TOXENV=py27-flake8
   - python: "3.7"
-    dist: xenial
     env: TOXENV=py37-flake8
 
 install:
-  - travis_retry pip install --upgrade pip setuptools tox ppu
+  - travis_retry pip install --upgrade "pip < 19.1" setuptools tox ppu
 
 script:
   - tox