summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2018-11-11 11:55:06 -0200
committerGitHub <noreply@github.com>2018-11-11 11:55:06 -0200
commit11a9cbd50b7f6ada59c8335f759d65439f85c29d (patch)
tree35b7d54df4038c1aad8701e7822ada9db149a007
parentb6f16abfe0f29c0f5a5b4d983950c7b77da40607 (diff)
parentdc9ceda5d2482b3d435b57afaef3e3f4a9a6137a (diff)
downloadpytest-11a9cbd50b7f6ada59c8335f759d65439f85c29d.tar.gz
Merge pull request #4365 from blueyed/xenial
Travis: use Xenial by default [skip appveyor]
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 00abca0b2..7f05bc558 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
sudo: false
language: python
+dist: xenial
stages:
- baseline
- name: test
@@ -27,14 +28,13 @@ jobs:
# Coverage tracking is slow with pypy, skip it.
- env: TOXENV=pypy PYTEST_NO_COVERAGE=1
python: 'pypy-5.4'
+ dist: trusty
- env: TOXENV=py35
python: '3.5'
- env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1
python: '3.6'
- env: TOXENV=py37
python: '3.7'
- sudo: required
- dist: xenial
- &test-macos
language: generic
os: osx
@@ -54,6 +54,7 @@ jobs:
- stage: baseline
env: TOXENV=py27
- env: TOXENV=py34
+ python: '3.4'
- env: TOXENV=py36
- env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1