Skip to content

Commit

Permalink
Merge pull request #1118 from jdufresne/xenial
Browse files Browse the repository at this point in the history
Use 'dist: xenial' in Travis to simplify configuration
  • Loading branch information
matthiask committed Nov 27, 2018
2 parents bb601f5 + aec6a15 commit 52f9ac8
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions .travis.yml
@@ -1,5 +1,6 @@
language: python
dist: xenial
sudo: false
language: python
cache: pip
matrix:
fast_finish: true
Expand All @@ -20,32 +21,27 @@ matrix:
env: TOXENV=py36-dj20
- python: 3.7
env: TOXENV=py37-dj20
dist: xenial
sudo: true
- python: 3.5
env: TOXENV=py35-dj21
- python: 3.6
env: TOXENV=py36-dj21
- python: 3.7
env: TOXENV=py37-dj21
dist: xenial
sudo: true
- python: 3.5
env: TOXENV=py35-djmaster
- python: 3.6
env: TOXENV=py36-djmaster
- python: 3.7
env: TOXENV=py37-djmaster
dist: xenial
sudo: true
- python: 3.6
- python: 3.7
env: TOXENV=postgresql
addons:
postgresql: "9.5"
- env: TOXENV=flake8
- python: 3.6
- python: 3.7
env: TOXENV=style
- env: TOXENV=readme
- python: 3.7
env: TOXENV=readme
allow_failures:
- env: TOXENV=py35-djmaster
- env: TOXENV=py36-djmaster
Expand Down

0 comments on commit 52f9ac8

Please sign in to comment.